From: Harald Hoyer <harald@redhat.com>
Date: Thu, 5 Nov 2009 14:57:52 +0000 (+0100)
Subject: crypt: refix rd_LUKS_UUID handling
X-Git-Tag: 003~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3844cbf4afc6eb6733e53ef5020c3498b5b3ab2;p=thirdparty%2Fdracut.git

crypt: refix rd_LUKS_UUID handling

https://bugzilla.redhat.com/show_bug.cgi?id=533177
---

diff --git a/modules.d/50plymouth/cryptroot-ask.sh b/modules.d/50plymouth/cryptroot-ask.sh
index 218808897..ff2866018 100755
--- a/modules.d/50plymouth/cryptroot-ask.sh
+++ b/modules.d/50plymouth/cryptroot-ask.sh
@@ -17,7 +17,8 @@ if [ -n "$LUKS" ]; then
     ask=0
     luuid=${2##luks-}
     for luks in $LUKS; do
-	if [ "${luuid##$luks}" != "$2" ]; then
+	luks=${luks##luks-}
+	if [ "${luuid##$luks}" != "$luuid" ]; then
 	    ask=1
 	fi
     done
diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
index 7872d6470..f945d5432 100755
--- a/modules.d/90crypt/cryptroot-ask.sh
+++ b/modules.d/90crypt/cryptroot-ask.sh
@@ -17,7 +17,8 @@ if [ -n "$LUKS" ]; then
     ask=0
     luuid=${2##luks-}
     for luks in $LUKS; do
-	if [ "${luuid##$luks}" != "$2" ]; then
+        luks=${luks##luks-}
+	if [ "${luuid##$luks}" != "$luuid" ]; then
 	    ask=1
 	fi
     done