From: Michal Schmidt <mschmidt@redhat.com>
Date: Mon, 6 Jun 2011 20:59:19 +0000 (+0200)
Subject: cryptsetup-generator: fix /etc/cryptsetup options
X-Git-Tag: v29~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aae5220d961a419a1e160de90ee5c393c7c13607;p=systemd

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 696f44ae..db8ebdfb 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;
                 }