[systemd-commits] 3 commits - src/cryptsetup.c src/path.c units/hwclock-load.service

[Lennart Poettering]

 src/cryptsetup.c           |    4 ++--
 src/path.c                 |    3 ++-
 units/hwclock-load.service |    1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 42e19823e649e7f29fab93d47f14738996c743f9
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 16 03:47:14 2010 +0100

    cryptsetup: reword questions a little

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 5afac64..ee15802 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -234,7 +234,7 @@ int main(int argc, char *argv[]) {
                         if (!key_file) {
                                 char *text;
 
-                                if (asprintf(&text, "Please enter passphrase for disk %s", argv[3]) < 0) {
+                                if (asprintf(&text, "Please enter passphrase for disk %s!", argv[2]) < 0) {
                                         log_error("Out of memory");
                                         goto finish;
                                 }
@@ -250,7 +250,7 @@ int main(int argc, char *argv[]) {
                                 if (opt_verify) {
                                         char *password2 = NULL;
 
-                                        if (asprintf(&text, "Please enter passphrase for disk %s (verification)", argv[3]) < 0) {
+                                        if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", argv[2]) < 0) {
                                                 log_error("Out of memory");
                                                 goto finish;
                                         }

commit eb8d87c12540b96a1e1935498e9a6f8ff2f2dd61
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 16 03:32:54 2010 +0100

    units: order hwclock after readahead

diff --git a/units/hwclock-load.service b/units/hwclock-load.service
index 3897b39..6a1951a 100644
--- a/units/hwclock-load.service
+++ b/units/hwclock-load.service
@@ -9,6 +9,7 @@
 Description=Apply System Clock UTC Offset
 DefaultDependencies=no
 Conflicts=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=basic.target shutdown.target udev.service
 
 [Service]

commit 4313fc2ceb6aa4dd9b8ddc02be65903cd5e071ac
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 16 03:27:00 2010 +0100

    path: don't mention too many inotify msgs

diff --git a/src/path.c b/src/path.c
index cc8b79a..0d59419 100644
--- a/src/path.c
+++ b/src/path.c
@@ -383,6 +383,7 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) {
         }
 
         if (good) {
+                log_debug("%s got triggered.", p->meta.id);
                 path_enter_running(p);
                 return;
         }
@@ -485,7 +486,7 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
             p->state != PATH_RUNNING)
                 return;
 
-        log_debug("inotify wakeup on %s.", u->meta.id);
+        /* log_debug("inotify wakeup on %s.", u->meta.id); */
 
         if (events != EPOLLIN) {
                 log_error("Got Invalid poll event on inotify.");