From: Harald Hoyer <harald@redhat.com>
Date: Wed, 16 Sep 2009 07:21:28 +0000 (+0200)
Subject: add udevproperty() to dracut-lib and use it
X-Git-Tag: 002~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1dd5bc3fba3e7fa1c16c252fceb5870335556763;p=thirdparty%2Fdracut.git

add udevproperty() to dracut-lib and use it

newer versions of udev use --property instead of --env
---

diff --git a/modules.d/90dmraid/parse-dm.sh b/modules.d/90dmraid/parse-dm.sh
index e6f9161a8..07208a521 100644
--- a/modules.d/90dmraid/parse-dm.sh
+++ b/modules.d/90dmraid/parse-dm.sh
@@ -1,4 +1,4 @@
 if getarg rd_NO_DM; then
     info "rd_NO_DM: removing DM RAID activation"
-    udevadm control --property=rd_NO_DM=1
+    udevproperty rd_NO_DM=1
 fi
diff --git a/modules.d/90mdraid/md-noimsm.sh b/modules.d/90mdraid/md-noimsm.sh
index 7ff0b3357..a08f676bd 100644
--- a/modules.d/90mdraid/md-noimsm.sh
+++ b/modules.d/90mdraid/md-noimsm.sh
@@ -1,2 +1,2 @@
 info "rd_NO_MDIMSM: no MD RAID for imsm/isw raids"
-udevadm control --property=rd_NO_MDIMSM=1
\ No newline at end of file
+udevproperty rd_NO_MDIMSM=1
\ No newline at end of file
diff --git a/modules.d/90mdraid/parse-md.sh b/modules.d/90mdraid/parse-md.sh
index a2cf599e0..cf9298f9d 100644
--- a/modules.d/90mdraid/parse-md.sh
+++ b/modules.d/90mdraid/parse-md.sh
@@ -1,6 +1,6 @@
 if getarg rd_NO_MD; then
     info "rd_NO_MD: removing MD RAID activation"
-    udevadm control --property=rd_NO_MD=1
+    udevproperty rd_NO_MD=1
 else
     MD_UUID=$(getargs rd_MD_UUID=)
 
@@ -26,11 +26,11 @@ fi
 
 
 if [ -e /etc/mdadm.conf ] && ! getarg rd_NO_MDADMCONF; then
-    udevadm control --property=rd_MDADMCONF=1
+    udevproperty rd_MDADMCONF=1
     rm -f /pre-pivot/*mdraid-cleanup.sh
 fi
 
 if getarg rd_NO_MDIMSM; then
     info "rd_NO_MDIMSM: no MD RAID for imsm/isw raids"
-    udevadm control --property=rd_NO_MDIMSM=1
+    udevproperty rd_NO_MDIMSM=1
 fi
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 3c6dd6480..a140125f9 100644
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -124,6 +124,16 @@ udevsettle() {
     fi
 }
 
+udevproperty() {
+    [ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
+
+    if [ $UDEVVERSION -ge 143 ]; then
+	for i in "$@"; do udevadm control --property=$i; done
+    else
+	for i in "$@"; do udevadm control --env=$i; done
+    fi
+}
+
 if [ -e /proc/cmdline ]; then
 	if getarg rdinitdebug; then
 	    set -x