run udevadm trigger for graphics for plymouth in pre-trigger hook
parent
345fbc8699
commit
1eeddd31af
2
dracut
2
dracut
|
@ -96,7 +96,7 @@ if [[ -f $outfile && ! $force ]]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
hookdirs="cmdline pre-udev netroot pre-mount pre-pivot mount emergency"
|
||||
hookdirs="cmdline pre-udev pre-trigger netroot pre-mount pre-pivot mount emergency"
|
||||
|
||||
readonly initdir=$(mktemp -d -t initramfs.XXXXXX)
|
||||
trap 'rm -rf "$initdir"' 0 # clean up after ourselves no matter how we die.
|
||||
|
|
|
@ -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+="cryptroot-ask $env{DEVNAME} luks-$env{ID_FS_UUID}"
|
||||
ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/sbin/cryptroot-ask $env{DEVNAME} luks-$env{ID_FS_UUID}"
|
||||
|
||||
LABEL="luks_end"
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
. "$moddir"/plymouth-populate-initrd
|
||||
inst_hook pre-udev 10 "$moddir"/plymouth-prep.sh
|
||||
inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
|
||||
inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
|
||||
inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
|
||||
inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
|
||||
# Include KMS capable drm drivers
|
||||
|
@ -10,4 +11,4 @@ for modname in `find "/lib/modules/$kernel/kernel/drivers/gpu/drm" -name '*.ko'`
|
|||
instmods $modname
|
||||
fi
|
||||
done
|
||||
inst_rules "$moddir/52-plymouth-start.rules"
|
||||
#inst_rules "$moddir/52-plymouth-start.rules"
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
# first trigger graphics subsystem
|
||||
udevadm trigger --subsystem-match=graphics >/dev/null 2>&1
|
||||
udevadm settle --timeout=30 >/dev/null 2>&1
|
||||
/bin/plymouth --show-splash
|
||||
|
|
@ -70,6 +70,10 @@ source_all pre-udev
|
|||
udevd --daemon
|
||||
getarg rdudevinfo && udevadm control --log_priority=info
|
||||
getarg rdudevdebug && udevadm control --log_priority=debug
|
||||
|
||||
source_all pre-trigger
|
||||
|
||||
# then the rest
|
||||
udevadm trigger >/dev/null 2>&1
|
||||
udevadm settle --timeout=30 >/dev/null 2>&1
|
||||
|
||||
|
|
Loading…
Reference in New Issue