add environment variables for different udev versions

diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh
index fcd75f7..4a14722 100755 (executable)
--- a/modules.d/90dmraid/dmraid.sh
+++ b/modules.d/90dmraid/dmraid.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if udevadm settle --timeout=1 >/dev/null 2>&1; then
+if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
     [ -h "$job" ] && rm -f "$job"
     # run dmraid if udev has settled
     dmraid -ay -Z

diff --git a/modules.d/99base/init b/modules.d/99base/init
index bced5b2..ea2f4c2 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -82,8 +82,17 @@ source_all pre-udev
 
 # start up udev and trigger cold plugs
 udevd --daemon
-getarg rdudevinfo && udevadm control --log_priority=info
-getarg rdudevdebug && udevadm control --log_priority=debug
+
+UDEV_LOG_PRIO_ARG=--log-priority
+UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
+
+if [ $UDEVVERSION -lt 140 ]; then
+   UDEV_LOG_PRIO_ARG=--log_priority
+   UDEV_QUEUE_EMPTY="udevadm settle --timeout=1"
+fi
+
+getarg rdudevinfo && udevadm control $UDEV_LOG_PRIO_ARG=info
+getarg rdudevdebug && udevadm control $UDEV_LOG_PRIO_ARG=debug
 
 source_all pre-trigger
 
@@ -127,7 +136,7 @@ while :; do
 
     [ -n "$queuetriggered" ] && continue
 
-    if udevadm settle --timeout=1 >/dev/null 2>&1; then
+    if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
         # no more udev jobs
         sleep 0.5
         i=$(($i+1))