crypt/crypt-run-generator: also skip if UUID match in crypttab

diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh
index 7842b3cbf20e9748ae0860c450ead9e8bfbbf240..a610d4285693e58b226abd8c0666544e046dc9fb 100755 (executable)
--- a/modules.d/90crypt/crypt-run-generator.sh
+++ b/modules.d/90crypt/crypt-run-generator.sh
@@ -8,8 +8,9 @@ dev=$1
 luks=$2
 
 if [ -f /etc/crypttab ]; then
-    while read l rest; do
+    while read l d rest; do
         strstr "${l##luks-}" "${luks##luks-}" && exit 0
+        strstr "$d" "${luks##luks-}" && exit 0
     done < /etc/crypttab
 fi
 

diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
index ac75f1000f610dceffbee1c808b2bbd20c4c00fb..1e87559f9b3b8d01c0ca83378ba9b0d87df3cc39 100755 (executable)
--- a/modules.d/90crypt/module-setup.sh
+++ b/modules.d/90crypt/module-setup.sh
@@ -73,10 +73,10 @@ install() {
                 fi
             done
         done < /etc/crypttab > $initdir/etc/crypttab
-    else
-        for_each_host_dev_fs check_crypt
     fi
 
+    for_each_host_dev_fs check_crypt
+
     inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
 
     inst_multiple -o \