From: Michal Soltys <soltys@ziu.info>
Date: Thu, 22 Sep 2011 15:23:21 +0000 (+0200)
Subject: 90mdraid: more thorough 64-md-raid.rules edit
X-Git-Tag: 014~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae816bb6aa461eb561debc9188e69f726b31d805;p=thirdparty%2Fdracut.git

90mdraid: more thorough 64-md-raid.rules edit

Catch more variations of incremental assembly.

Signed-off-by: Michal Soltys <soltys@ziu.info>
---

diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
index d4a987070..5e819b159 100755
--- a/modules.d/90mdraid/module-setup.sh
+++ b/modules.d/90mdraid/module-setup.sh
@@ -54,7 +54,7 @@ install() {
         # 65-md-inc*.rules and its fine-grained controls, or cause other problems
         # when we explicitly don't want certain components to be incrementally
         # assembled
-        sed -i -e '/^ENV{ID_FS_TYPE}==.*ACTION=="add".*RUN+="\/sbin\/mdadm --incremental $env{DEVNAME}"$/d' "${initdir}/lib/udev/rules.d/64-md-raid.rules"
+        sed -ire '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode)"/d' "${initdir}/lib/udev/rules.d/64-md-raid.rules"
     fi
 
     inst_rules "$moddir/65-md-incremental-imsm.rules"