Browse Source

add udevproperty() to dracut-lib and use it

newer versions of udev use --property instead of --env
master
Harald Hoyer 16 years ago
parent
commit
1dd5bc3fba
  1. 2
      modules.d/90dmraid/parse-dm.sh
  2. 2
      modules.d/90mdraid/md-noimsm.sh
  3. 6
      modules.d/90mdraid/parse-md.sh
  4. 10
      modules.d/99base/dracut-lib.sh

2
modules.d/90dmraid/parse-dm.sh

@ -1,4 +1,4 @@ @@ -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

2
modules.d/90mdraid/md-noimsm.sh

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
info "rd_NO_MDIMSM: no MD RAID for imsm/isw raids"
udevadm control --property=rd_NO_MDIMSM=1
udevproperty rd_NO_MDIMSM=1

6
modules.d/90mdraid/parse-md.sh

@ -1,6 +1,6 @@ @@ -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 @@ -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

10
modules.d/99base/dracut-lib.sh

@ -124,6 +124,16 @@ udevsettle() { @@ -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

Loading…
Cancel
Save