simplify plymouth startup

diff --git a/modules.d/50plymouth/install b/modules.d/50plymouth/install
index 7800c62ecb5bcbddedf2070a85536f4c5a2c87f3..e5ba79cbb6d7fc8fdde0b8491b03b5f3fa820a5d 100755 (executable)
--- a/modules.d/50plymouth/install
+++ b/modules.d/50plymouth/install
@@ -1,6 +1,5 @@
 #!/bin/bash
 . "$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

diff --git a/modules.d/50plymouth/plymouth-prep.sh b/modules.d/50plymouth/plymouth-prep.sh
deleted file mode 100755 (executable)
index 3281835..0000000
--- a/modules.d/50plymouth/plymouth-prep.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-[ -c /dev/null ] || mknod /dev/null c 1 3
-mknod /dev/zero c 1 5
-mknod /dev/systty c 4 0
-mknod /dev/tty c 5 0
-[ -c /dev/console ] || mknod /dev/console c 5 1
-[ -c /dev/ptmx ] || mknod /dev/ptmx c 5 2
-mknod /dev/fb c 29 0
-mknod /dev/tty0 c 4 0
-mknod /dev/tty1 c 4 1
-mknod /dev/tty2 c 4 2
-mknod /dev/tty3 c 4 3
-mknod /dev/tty4 c 4 4
-mknod /dev/tty5 c 4 5
-mknod /dev/tty6 c 4 6
-mknod /dev/tty7 c 4 7
-mknod /dev/tty8 c 4 8
-mknod /dev/tty9 c 4 9
-mknod /dev/tty10 c 4 10
-mknod /dev/tty11 c 4 11
-mknod /dev/tty12 c 4 12
-mknod /dev/ttyS0 c 4 64
-mknod /dev/ttyS1 c 4 65
-mknod /dev/ttyS2 c 4 66
-mknod /dev/ttyS3 c 4 67
-/lib/udev/console_init tty0
-
-[ -x /bin/plymouthd ] && /bin/plymouthd 
-

diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
index ee9a7b2a7c7c1511a698088ff3ec5a24db395ae2..b792ff5cffef95de434acce637db945068ee19a8 100755 (executable)
--- a/modules.d/50plymouth/plymouth-pretrigger.sh
+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
@@ -1,7 +1,16 @@
 #!/bin/sh
 
 # first trigger graphics subsystem
-udevadm trigger --subsystem-match=graphics >/dev/null 2>&1
+udevadm trigger --subsystem-match=graphics --subsystem-match=tty >/dev/null 2>&1
 udevadm settle --timeout=30 >/dev/null 2>&1
+[ -c /dev/null ] || mknod /dev/null c 1 3
+[ -c /dev/zero ] || mknod /dev/zero c 1 5
+[ -c /dev/systty ] || mknod /dev/systty c 4 0
+[ -c /dev/fb ] || mknod /dev/fb c 29 0
+[ -c /dev/hvc0 ] || mknod /dev/hvc0 c 229 0
+
+[ -x /bin/plymouthd ] && /bin/plymouthd
+
+/lib/udev/console_init tty0
 /bin/plymouth --show-splash