From: Harald Hoyer <harald@redhat.com>
Date: Mon, 12 Aug 2013 23:20:06 +0000 (+0200)
Subject: crypt/crypt-run-generator: also skip if UUID match in crypttab
X-Git-Tag: 032~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=730b9b8b7711ed29d681dc60f95a220f22439afc;p=platform%2Fupstream%2Fdracut.git

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 7842b3cb..a610d428 100755
--- 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 ac75f100..1e87559f 100755
--- 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 \