From 36894743e3105e4831a2d04fc5671c16fc5900c2 Mon Sep 17 00:00:00 2001

From: NeilBrown <neilb@suse.de>

Date: Thu, 11 Dec 2014 15:45:54 +0100

Subject: [PATCH] Fixup mdraid setup

This sed script to edit 64-md-raid-assemble.rules needs to

be adjusted for latest mdadm

References: bnc#866660

Signed-off-by: NeilBrown <neilb@suse.de>

Signed-off-by: Thomas Renninger <trenn@suse.de>

---

 modules.d/90mdraid/module-setup.sh | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh

index bc4c514..ce3394a 100755

--- a/modules.d/90mdraid/module-setup.sh

+++ b/modules.d/90mdraid/module-setup.sh

@@ -86,7 +86,7 @@ install() {

     for rule in 64-md-raid.rules 64-md-raid-assembly.rules; do

         rule_path="${initdir}${udevdir}/rules.d/${rule}"

         [ -f "${rule_path}" ] && sed -i -r \

-            -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode|\$devnode)/d' \

+            -e '/(RUN|IMPORT\{program\})\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(--export )?(\$env\{DEVNAME\}|\$tempnode|\$devnode)/d' \

             "${rule_path}"

     done