90mdraid: adjust /dev/md loops

Include '_' to also handle old partitionable arrays (pre-2.6.28).

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

diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
index ea3a88906951ee4b4ff883471cedfecd90a15a62..2a80700bae48507968b6e79a365c23274b9b70b1 100644 (file)
--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
+++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
@@ -15,7 +15,7 @@ ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}=="?*", GOTO="md_end"
 ENV{ID_FS_TYPE}=="ddf_raid_member", ENV{rd_NO_MDDDF}=="?*", GOTO="md_end"
 
 # already done ?
-PROGRAM="/bin/sh -c 'for i in $sys/$devpath/holders/md[0-9]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
+PROGRAM="/bin/sh -c 'for i in $sys/$devpath/holders/md[0-9_]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
     GOTO="md_end"
 
 # for native arrays - array's uuid has to be specified

diff --git a/modules.d/90mdraid/mdraid-cleanup.sh b/modules.d/90mdraid/mdraid-cleanup.sh
index 8fc54e2c2d8a49c5aa252305cdf70382a4367e17..3ffa2d3b9fadb3c54a07ff0fa2a3f5c240d14c68 100755 (executable)
--- a/modules.d/90mdraid/mdraid-cleanup.sh
+++ b/modules.d/90mdraid/mdraid-cleanup.sh
@@ -5,7 +5,7 @@
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
 containers=""
-for md in /dev/md[0-9]*; do
+for md in /dev/md[0-9_]*; do
     [ -b "$md" ] || continue
     udevinfo="$(udevadm info --query=env --name=$md)"
     strstr "$udevinfo" "DEVTYPE=partition" && continue

diff --git a/modules.d/90mdraid/mdraid_start.sh b/modules.d/90mdraid/mdraid_start.sh
index be5a3cecbe2b7ed546bf69fe08a422de9785ffcb..f79f16ebf465487912e755e3eeab5a3e945cda29 100755 (executable)
--- a/modules.d/90mdraid/mdraid_start.sh
+++ b/modules.d/90mdraid/mdraid_start.sh
@@ -8,7 +8,7 @@ _md_force_run() {
     local _path_s
     local _path_d
     # try to force-run anything not running yet
-    for md in /dev/md[0-9]*; do
+    for md in /dev/md[0-9_]*; do
         [ -b "$md" ] || continue
         _udevinfo="$(udevadm info --query=env --name="$md")"
         strstr "$_udevinfo" "MD_LEVEL=container" && continue