From: Victor Lowther <victor.lowther@gmail.com>
Date: Thu, 19 Mar 2009 14:59:06 +0000 (-0500)
Subject: Unlock our encrypted root in a udev rule.
X-Git-Tag: 0.1~282^2~12^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa0115c3c06176bd0fdfcd8966021979ec84f3d7;p=thirdparty%2Fdracut.git

Unlock our encrypted root in a udev rule.
---

diff --git a/modules.d/90crypt/63-luks.rules b/modules.d/90crypt/63-luks.rules
index 802ea062e..d225f75c9 100644
--- a/modules.d/90crypt/63-luks.rules
+++ b/modules.d/90crypt/63-luks.rules
@@ -8,6 +8,6 @@ SUBSYSTEM!="block", GOTO="luks_end"
 ACTION!="add|change", GOTO="luks_end"
 
 KERNEL!="sr*", IMPORT{program}="vol_id --export $tempnode"
-ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/bin/sh -c 'echo $env{DEVNAME} luks-$env{ID_FS_UUID} >>/cryptroot'"
+ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/bin/cryptroot.sh $env{DEVNAME} luks-$env{ID_FS_UUID}"
 
 LABEL="luks_end"
diff --git a/modules.d/90crypt/cryptroot.sh b/modules.d/90crypt/cryptroot.sh
index d00d5cc13..21323665f 100755
--- a/modules.d/90crypt/cryptroot.sh
+++ b/modules.d/90crypt/cryptroot.sh
@@ -1,13 +1,4 @@
 #!/bin/sh
-[ -s /cryptroot ] && { 
-    udevadm control --stop_exec_queue
-    while read cryptopts; do
-       (   exec >/dev/console 2>&1 </dev/console
-	   set $cryptopts
-	   [ -b /dev/mapper/$2 ] || ( /sbin/cryptsetup luksOpen $cryptopts || emergency_shell )
-       )
-    done </cryptroot
-    >/cryptroot
-    udevadm control --start_exec_queue
-    udevadm settle --timeout=30
-}
+exec >/dev/console 2>&1 </dev/console
+[ -b /dev/mapper/$2 ] && exit 0
+/sbin/cryptsetup -T 3 -t 30 luksOpen $1 $2
diff --git a/modules.d/90crypt/install b/modules.d/90crypt/install
index 82f8ffdb4..708d5a493 100755
--- a/modules.d/90crypt/install
+++ b/modules.d/90crypt/install
@@ -2,4 +2,4 @@
 inst cryptsetup
 instmods dm_crypt =crypto
 inst_rules "$moddir/63-luks.rules"
-inst_hook mount 10 "$moddir/cryptroot.sh"
\ No newline at end of file
+inst "$moddir/cryptroot.sh" "/bin/cryptroot.sh"
\ No newline at end of file