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

This reverts commit 79ec17c74d74e3b23706542ec548874d36be2de3.

diff --git a/modules.d/50plymouth/cryptroot.sh b/modules.d/50plymouth/cryptroot.sh
deleted file mode 100755 (executable)
index afb5f84..0000000
--- a/modules.d/50plymouth/cryptroot.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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/50plymouth/install b/modules.d/50plymouth/install
index e05f48f3b0f02e54029867e069b1a551e1655de3..fb07f0de83302d172dfdfa1cb1979390c738fa33 100755 (executable)
--- a/modules.d/50plymouth/install
+++ b/modules.d/50plymouth/install
@@ -3,5 +3,7 @@ echo "installing plymouth"
 . "$moddir"/plymouth-populate-initrd
 inst_hook pre-udev 10 "$moddir"/plymouth-start.sh
 inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
-inst_hook mount 10 "$moddir/cryptroot.sh"
+inst_rules "$moddir/63-luks.rules"
+inst "$moddir"/plymouth-ask.sh /lib/udev/plymouth-ask
+inst cryptsetup
 

diff --git a/modules.d/50plymouth/plymouth-ask.sh b/modules.d/50plymouth/plymouth-ask.sh
new file mode 100755 (executable)
index 0000000..fadb502
--- /dev/null
+++ b/modules.d/50plymouth/plymouth-ask.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -b /dev/mapper/$2 ] || exec /bin/plymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T1 $1 $2"
+