make udevtriggeropts just use an environment variable

No point in making a file and then reading from it when hooks are sourced.

diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
index 78c8c06e673c3d7e72efc8f4d4cd381471b3fcbe..67992a80019504ca96bc4ff432292e0753472d90 100755 (executable)
--- a/modules.d/50plymouth/plymouth-pretrigger.sh
+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
@@ -5,7 +5,7 @@ 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
+udevtriggeropts="$udevtriggeropts --subsystem-nomatch=graphics --subsystem-nomatch=tty"
 
 udevadm settle --timeout=30 >/dev/null 2>&1
 [ -c /dev/null ] || mknod /dev/null c 1 3

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 244f80658787e096ceeedf82bbd69529498e0d57..53e28ef2302f4b339b8d8e3601ceeaf3566ed09a 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -74,7 +74,6 @@ getarg rdudevdebug && udevadm control --log_priority=debug
 source_all pre-trigger
 
 # then the rest
-[ -f /tmp/udevtriggeropts ] && udevtriggeropts=$(while read line; do echo $line;done < /tmp/udevtriggeropts)
 udevadm trigger $udevtriggeropts  >/dev/null 2>&1
 udevadm settle --timeout=30 >/dev/null 2>&1