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

Kay Sievers kay at kemper.freedesktop.org
Mon Jun 6 14:01:22 PDT 2011


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

New commits:
commit aae5220d961a419a1e160de90ee5c393c7c13607
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Mon Jun 6 22:59:19 2011 +0200

    cryptsetup-generator: fix /etc/cryptsetup options
    
    cryptsetup-generator parses the options in /etc/cryptsetup incorrectly.
    It fails to find the 'swap' option in
      swap,foo
    and instead it matches on
      swaplalala,foo
    
    The condition for the comma separator is reversed.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=710839

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index 696f44a..db8ebdf 100644
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -47,7 +47,7 @@ static bool has_option(const char *haystack, const char *needle) {
                         continue;
                 }
 
-                if (f[l] != 0 && f[l] == ',') {
+                if (f[l] != 0 && f[l] != ',') {
                         f++;
                         continue;
                 }



More information about the systemd-commits mailing list