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

This reverts commit 79ec17c74d.
This commit is contained in:
Harald Hoyer 2009-03-09 09:23:24 +01:00
parent f5f9bfee2d
commit e22d1330d1
3 changed files with 7 additions and 15 deletions

View File

@ -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
}

View File

@ -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

View File

@ -0,0 +1,4 @@
#!/bin/sh
[ -b /dev/mapper/$2 ] || exec /bin/plymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T1 $1 $2"