From: Harald Hoyer <harald@redhat.com>
Date: Fri, 14 Aug 2009 14:11:35 +0000 (+0200)
Subject: cryptroot-ask.sh: fix rd_LUKS_UUID handling
X-Git-Tag: 0.9~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed2de829e1a1a1a3872da8ff9c50acfea7091175;p=thirdparty%2Fdracut.git

cryptroot-ask.sh: fix rd_LUKS_UUID handling
---

diff --git a/modules.d/50plymouth/cryptroot-ask.sh b/modules.d/50plymouth/cryptroot-ask.sh
index 75c6550dd..9dbb44fb4 100755
--- a/modules.d/50plymouth/cryptroot-ask.sh
+++ b/modules.d/50plymouth/cryptroot-ask.sh
@@ -15,8 +15,9 @@ ask=1
 
 if [ -n "$LUKS" ]; then
     ask=0
+    luuid=${2##luks-}
     for luks in $LUKS; do
-	if [ "${2##$luks}" != "$2" ]; then
+	if [ "${luuid##$luks}" != "$2" ]; then
 	    ask=1
 	fi
     done
diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
index 5b5d895f7..9d238088d 100755
--- a/modules.d/90crypt/cryptroot-ask.sh
+++ b/modules.d/90crypt/cryptroot-ask.sh
@@ -15,8 +15,9 @@ ask=1
 
 if [ -n "$LUKS" ]; then
     ask=0
+    luuid=${2##luks-}
     for luks in $LUKS; do
-	if [ "${2##$luks}" != "$2" ]; then
+	if [ "${luuid##$luks}" != "$2" ]; then
 	    ask=1
 	fi
     done
@@ -33,4 +34,4 @@ fi
 # mark device as asked
 >> /tmp/cryptroot-asked-$2
 
-exit 0
\ No newline at end of file
+exit 0