summaryrefslogtreecommitdiff
path: root/modules.d/90mdraid
diff options
context:
space:
mode:
authorMichal Soltys <soltys@ziu.info>2011-09-22 17:16:39 +0200
committerMichal Soltys <soltys@ziu.info>2011-09-22 17:34:51 +0200
commit9fc3f0452023c42c235c3312ad311243e7f900a2 (patch)
tree00fc521cf7c3afd22596635f560702bd42ad77c1 /modules.d/90mdraid
parentae816bb6aa461eb561debc9188e69f726b31d805 (diff)
downloaddracut-9fc3f0452023c42c235c3312ad311243e7f900a2.tar.gz
dracut-9fc3f0452023c42c235c3312ad311243e7f900a2.tar.bz2
dracut-9fc3f0452023c42c235c3312ad311243e7f900a2.zip
90mdraid: adjust /dev/md loops
Include '_' to also handle old partitionable arrays (pre-2.6.28). Signed-off-by: Michal Soltys <soltys@ziu.info>
Diffstat (limited to 'modules.d/90mdraid')
-rw-r--r--modules.d/90mdraid/65-md-incremental-imsm.rules2
-rwxr-xr-xmodules.d/90mdraid/mdraid-cleanup.sh2
-rwxr-xr-xmodules.d/90mdraid/mdraid_start.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
index ea3a8890..2a80700b 100644
--- 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 8fc54e2c..3ffa2d3b 100755
--- 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 be5a3cec..f79f16eb 100755
--- 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