add udevproperty() to dracut-lib and use it
newer versions of udev use --property instead of --envmaster
parent
bf55e2c5d3
commit
1dd5bc3fba
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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…
Reference in New Issue