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 218808897aa3ee0efed437af9ba4c1bb75c8daa1..ff28660186b6e4b050a27db6362708d3a088e3d4 100755 (executable)
--- 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 7872d6470e93bfc9c8d8b672fead55b2deba3cdb..f945d54325e6769e6e2bb9f794567e02feb5398d 100755 (executable)
--- 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