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 75c6550dd7c3a4e63cea03651641561dbadbd2e1..9dbb44fb47eebbd0d6324d50eb831905e49bd8cf 100755 (executable)
--- 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 5b5d895f710a56de236af863f6732ff90f402fff..9d238088d04d7fdf84c30cf7dda72a73d17a2910 100755 (executable)
--- 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