add support to specify additional udev trigger options

diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
index 755e97ccfeff78ee9fff101ad352fb53f8fa2e4e..78c8c06e673c3d7e72efc8f4d4cd381471b3fcbe 100755 (executable)
--- a/modules.d/50plymouth/plymouth-pretrigger.sh
+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
@@ -2,7 +2,11 @@
 
 # first trigger graphics subsystem
 udevadm trigger --attr-match=class=0x030000
+# first trigger graphics and tty subsystem
 udevadm trigger --subsystem-match=graphics --subsystem-match=tty >/dev/null 2>&1
+# add nomatch for full trigger
+echo " --subsystem-nomatch=graphics --subsystem-nomatch=tty " >> /tmp/udevtriggeropts
+
 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

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 234cf49e0ae34c628c65f3d2d2413f0d251e051c..90677beee337206439c8131b96638c6cf0bef330 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -74,7 +74,7 @@ getarg rdudevdebug && udevadm control --log_priority=debug
 source_all pre-trigger
 
 # then the rest
-udevadm trigger >/dev/null 2>&1
+udevadm trigger $(cat /tmp/udevtriggeropts) >/dev/null 2>&1
 udevadm settle --timeout=30 >/dev/null 2>&1
 
 # pre-mount happens before we try to mount the root filesystem,