crypt: refix rd_LUKS_UUID handling

https://bugzilla.redhat.com/show_bug.cgi?id=533177
2009-11-05 15:57:52 +01:00 · 2009-11-05 15:57:52 +01:00 · c3844cbf4a
parent 556e4ccb42
commit c3844cbf4a
2 changed files with 4 additions and 2 deletions
--- 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
--- 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