[systemd-commits] 3 commits - man/crypttab.xml src/core src/cryptsetup

[Lennart Poettering]

 man/crypttab.xml            |    7 ++++---
 src/core/execute.c          |   11 ++++++-----
 src/cryptsetup/cryptsetup.c |    2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 8b95c916386eff949d5a8abadf82cda09799794f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Apr 18 02:21:01 2013 +0200

    man: document that timeout=0 is the default for entries in crypttab

diff --git a/man/crypttab.xml b/man/crypttab.xml
index a94163b..deb577b 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -219,9 +219,10 @@
                                 <listitem><para>Specify the timeout
                                 for querying for a password. If no
                                 unit is specified seconds is used.
-                                Supported units are s, ms,
-                                us, min, h, d. A timeout of 0 waits
-                                indefinitely.</para></listitem>
+                                Supported units are s, ms, us, min, h,
+                                d. A timeout of 0 waits indefinitely
+                                (which is the
+                                default).</para></listitem>
                         </varlistentry>
 
                         <varlistentry>

commit 49714341c3f815118f8a51136aa9857bab7144c2
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Apr 12 09:45:26 2013 +0200

    cryptsetup: set the timeout to 0 by default
    
    cryptsetup itself has no timeout as default from the beginning. So the
    default timeout has been "0" from the beginning.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=949702

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index ae4aa8d..376f748 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -44,7 +44,7 @@ static unsigned opt_tries = 0;
 static bool opt_readonly = false;
 static bool opt_verify = false;
 static bool opt_discards = false;
-static usec_t opt_timeout = DEFAULT_TIMEOUT_USEC;
+static usec_t opt_timeout = 0;
 
 /* Options Debian's crypttab knows we don't:
 

commit 099a804b11072b6be9fd32b3aa1f90b393adef98
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Apr 18 02:18:33 2013 +0200

    execute: always add in EXECUTABLE= field when we log something about execution

diff --git a/src/core/execute.c b/src/core/execute.c
index c363342..aad11c9 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1036,9 +1036,10 @@ int exec_spawn(ExecCommand *command,
                 return log_oom();
 
         log_struct_unit(LOG_DEBUG,
-                   unit_id,
-                   "MESSAGE=About to execute %s", line,
-                   NULL);
+                        unit_id,
+                        "EXECUTABLE=%s", command->path,
+                        "MESSAGE=About to execute: %s", line,
+                        NULL);
         free(line);
 
         r = cgroup_bonding_realize_list(cgroup_bondings);
@@ -1523,8 +1524,8 @@ int exec_spawn(ExecCommand *command,
                                 log_struct_unit(LOG_DEBUG,
                                                 unit_id,
                                                 "EXECUTABLE=%s", command->path,
-                                                "MESSAGE=Executing: %s",
-                                                line, NULL);
+                                                "MESSAGE=Executing: %s", line,
+                                                NULL);
                                 log_close();
                                 free(line);
                                 line = NULL;