From: Harald Hoyer <harald@redhat.com>
Date: Thu, 12 Nov 2009 13:56:36 +0000 (+0100)
Subject: crypt: ignore devices in /etc/crypttab (root is not in there)
X-Git-Tag: 003~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=394f30d8d4921ff710ab4d6baefe7b9bda40bc62;p=thirdparty%2Fdracut.git

crypt: ignore devices in /etc/crypttab (root is not in there)
---

diff --git a/modules.d/50plymouth/cryptroot-ask.sh b/modules.d/50plymouth/cryptroot-ask.sh
index b0599af60..47dd9d834 100755
--- a/modules.d/50plymouth/cryptroot-ask.sh
+++ b/modules.d/50plymouth/cryptroot-ask.sh
@@ -16,12 +16,15 @@ luksname=$2
 if [ -f /etc/crypttab ] && ! getargs rd_NO_CRYPTTAB; then
     found=0
     while read name dev rest; do
-	cdev=$(readlink -f $dev)
-	mdev=$(readlink -f $1)
-	if [ "$cdev" = "$mdev" ]; then
-	    luksname="$name"
-	    break
-	fi
+        cdev=$(readlink -f $dev)
+        mdev=$(readlink -f $1)
+        if [ "$cdev" = "$mdev" ]; then
+            # for now just ignore everything which is in crypttab
+            # anaconda does not write an entry for root
+            exit 0
+            #luksname="$name"
+            #break
+    fi
     done < /etc/crypttab
 fi
 
@@ -59,4 +62,5 @@ unset LUKS
 unset ask
 unset luks
 exit 0
+# vim:ts=8:sw=4:sts=4:et
 
diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
index 3a20d22f3..b1c188949 100755
--- a/modules.d/90crypt/cryptroot-ask.sh
+++ b/modules.d/90crypt/cryptroot-ask.sh
@@ -18,8 +18,11 @@ if [ -f /etc/crypttab ] && ! getargs rd_NO_CRYPTTAB; then
 	cdev=$(readlink -f $dev)
 	mdev=$(readlink -f $1)
 	if [ "$cdev" = "$mdev" ]; then
-	    luksname="$name"
-	    break
+            # for now just ignore everything which is in crypttab
+            # anaconda does not write an entry for root
+            exit 0
+            #luksname="$name"
+            #break
 	fi
     done < /etc/crypttab
 fi