[systemd-commits] src/cryptsetup

[Tom Gundersen]

 src/cryptsetup/cryptsetup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit adc40dc2f670a6298cce918fb318ba6a4b80c306
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Nov 21 12:30:47 2012 +0100

    cryptsetup: fix nofail support
    
    This was documented in the man page and supported in the generator,
    but systemd-cryptestup itself would fail with this option.
    
    systemd-cryptsetup should ignore 'nofail', as it does with 'noauto'.

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 56a3b50..f332843 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -62,7 +62,7 @@ static int parse_one_option(const char *option) {
         assert(option);
 
         /* Handled outside of this tool */
-        if (streq(option, "noauto"))
+        if (streq(option, "noauto") || streq(option, "nofail"))
                 return 0;
 
         if (startswith(option, "cipher=")) {