[systemd-commits] 2 commits - src/cryptsetup.c src/cryptsetup-generator.c

[Lennart Poettering]

 src/cryptsetup-generator.c |    3 ++-
 src/cryptsetup.c           |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1c5224b33630a1f95952796b2cb582be052e0c27
Author: Frederic Crozat <fcrozat at suse.com>
Date:   Thu Aug 4 16:46:33 2011 +0200

    cryptsetup-generator: block boot when querying passphrase.
    
    Ensure we wait for passphrase before starting tty1 or graphical display.
    Needed when not using plymouth.

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index a340218..6f3aa78 100644
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -112,7 +112,8 @@ static int create_disk(
                 "DefaultDependencies=no\n"
                 "BindTo=%s dev-mapper-%%i.device\n"
                 "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
-                "Before=umount.target\n",
+                "Before=umount.target\n"
+                "Before=local-fs.target\n",
                 d, d);
 
         if (!nofail)

commit 41e6f28acc906960f21658c94ac79652705ded0c
Author: Frederic Crozat <fcrozat at suse.com>
Date:   Thu Aug 4 16:04:43 2011 +0200

    cryptsetup: accept "none" option

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index cf288de..ac7b6d6 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -110,7 +110,7 @@ static int parse_one_option(const char *option) {
                         return 0;
                 }
 
-        } else
+        } else if (!streq(option, "none"))
                 log_error("Encountered unknown /etc/crypttab option '%s', ignoring.", option);
 
         return 0;