From 4782a8f6949384e93aff0b630cf0772b8eddb2ac Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 21 Sep 2009 13:09:18 -0400 Subject: Do not try and activate ISW raidsets, unless noiswmd is passed. (#524355, ) --- rc.d/rc.sysinit | 8 +++++--- 1 file 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 -- cgit v1.2.1