diff options
author | Bill Nottingham <notting@redhat.com> | 2009-09-21 13:09:18 -0400 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2009-09-21 13:09:18 -0400 |
commit | 4782a8f6949384e93aff0b630cf0772b8eddb2ac (patch) | |
tree | c717fe15b0c9ed302ba75cfa650588faa5acd639 | |
parent | f2c05c3bbb7bb735dd681d29b2e891b768e2ff5b (diff) | |
download | initscripts-4782a8f6949384e93aff0b630cf0772b8eddb2ac.tar initscripts-4782a8f6949384e93aff0b630cf0772b8eddb2ac.tar.gz initscripts-4782a8f6949384e93aff0b630cf0772b8eddb2ac.tar.bz2 initscripts-4782a8f6949384e93aff0b630cf0772b8eddb2ac.tar.xz initscripts-4782a8f6949384e93aff0b630cf0772b8eddb2ac.zip |
Do not try and activate ISW raidsets, unless noiswmd is passed. (#524355, <hdegoede@redhat.com>)
-rwxr-xr-x | rc.d/rc.sysinit | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 4155c9f2..f0dc35d7 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -362,9 +362,11 @@ fi if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then modprobe dm-mirror >/dev/null 2>&1 - for dmname in $(/sbin/dmraid -ay -i -p -t 2>/dev/null | \ - egrep -iv "^no " | \ - awk -F ':' '{ print $1 }') ; do + for dmname in $(/sbin/dmraid -s -c -i); do + if [[ "$dmname" =~ '^isw_.*' ]] && \ + ! strstr "$cmdline" noiswmd; then + continue + fi /sbin/dmraid -ay -i --rm_partitions -p "$dmname" >/dev/null 2>&1 /sbin/kpartx -a -p p "/dev/mapper/$dmname" done |