From: Victor Lowther <victor.lowther@gmail.com>
Date: Fri, 6 Mar 2009 22:00:56 +0000 (-0600)
Subject: Make plymouth play nice with the current crypt code, part 1
X-Git-Tag: 0.1~321
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79ec17c74d74e3b23706542ec548874d36be2de3;p=thirdparty%2Fdracut.git

Make plymouth play nice with the current crypt code, part 1
---

diff --git a/modules.d/91plymouth/cryptroot.sh b/modules.d/91plymouth/cryptroot.sh
new file mode 100755
index 000000000..afb5f84f8
--- /dev/null
+++ b/modules.d/91plymouth/cryptroot.sh
@@ -0,0 +1,14 @@
+#!/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 ] || /bin/plymouth ask-for-password \
+	       --command="/sbin/cryptsetup luksOpen -T1 $cryptopts"
+       )
+    done </cryptroot
+    >/cryptroot
+    udevadm control --start-exec-queue
+    udevadm settle --timeout=30
+}
diff --git a/modules.d/91plymouth/install b/modules.d/91plymouth/install
index ccc14cf9f..2cb53bae9 100755
--- a/modules.d/91plymouth/install
+++ b/modules.d/91plymouth/install
@@ -3,7 +3,5 @@ echo "installing plymouth"
 . "$moddir"/plymouth-populate-initrd  -t "$initdir"
 inst_hook pre-udev 10 "$moddir"/plymouth-start.sh
 inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
-inst_rules "$moddir/63-luks.rules"
-inst "$moddir"/plymouth-ask.sh /lib/udev/plymouth-ask
-inst cryptsetup
+inst_hook mount 10 "$moddir/cryptroot.sh"
 
diff --git a/modules.d/91plymouth/plymouth-ask.sh b/modules.d/91plymouth/plymouth-ask.sh
deleted file mode 100755
index fadb50227..000000000
--- a/modules.d/91plymouth/plymouth-ask.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -b /dev/mapper/$2 ] || exec /bin/plymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T1 $1 $2"
-