Recognize nodmraid and noiswmd kernel cmdline options

Recognize nodmraid and noiswmd kernel cmdline options, for anaconda /
rc.sysinit / mkinitrd compatibility.

diff --git a/modules.d/90dmraid/parse-dm.sh b/modules.d/90dmraid/parse-dm.sh
index 07208a5..f031569 100644 (file)
--- a/modules.d/90dmraid/parse-dm.sh
+++ b/modules.d/90dmraid/parse-dm.sh
@@ -1,4 +1,5 @@
-if getarg rd_NO_DM; then
+# nodmraid for anaconda / rc.sysinit compatibility
+if getarg rd_NO_DM || getarg nodmraid; then
     info "rd_NO_DM: removing DM RAID activation"
     udevproperty rd_NO_DM=1
 fi

diff --git a/modules.d/90mdraid/parse-md.sh b/modules.d/90mdraid/parse-md.sh
index cf9298f..6e2a3bf 100644 (file)
--- a/modules.d/90mdraid/parse-md.sh
+++ b/modules.d/90mdraid/parse-md.sh
@@ -30,7 +30,9 @@ if [ -e /etc/mdadm.conf ] && ! getarg rd_NO_MDADMCONF; then
     rm -f /pre-pivot/*mdraid-cleanup.sh
 fi
 
-if getarg rd_NO_MDIMSM; then
+# noiswmd nodmraid for anaconda / rc.sysinit compatibility
+# note nodmraid really means nobiosraid, so we don't want MDIMSM then either
+if getarg rd_NO_MDIMSM || getarg noiswmd || getarg nodmraid; then
     info "rd_NO_MDIMSM: no MD RAID for imsm/isw raids"
     udevproperty rd_NO_MDIMSM=1
 fi