[systemd-devel] [PATCH] cryptsetup-generator: fix /etc/cryptsetup options

Michal Schmidt mschmidt at redhat.com
Mon Jun 6 13:31:18 PDT 2011


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
---

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

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-devel mailing list