diff options
author | Bill Nottingham <notting@redhat.com> | 2009-10-09 16:18:04 -0400 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2010-09-13 15:38:37 +0200 |
commit | 209e5e18cbd1cbb76f7e49c83854763c4e9f1d1c (patch) | |
tree | 50cc3c3fbd3f15f55fb04e8c2ef028c10a80050d /rc.d/rc.sysinit | |
parent | 40ddde4c4e6ad1dc855a8a3f4ae594d6c2d16179 (diff) | |
download | initscripts-209e5e18cbd1cbb76f7e49c83854763c4e9f1d1c.tar initscripts-209e5e18cbd1cbb76f7e49c83854763c4e9f1d1c.tar.gz initscripts-209e5e18cbd1cbb76f7e49c83854763c4e9f1d1c.tar.bz2 initscripts-209e5e18cbd1cbb76f7e49c83854763c4e9f1d1c.tar.xz initscripts-209e5e18cbd1cbb76f7e49c83854763c4e9f1d1c.zip |
Do not try to activate subsets and layer raid and handle 'no raid disks'.
- 'no raid disks' handling: (#527726, <mschmidt@redhat.com>)
- no subsets: https://bugzilla.redhat.com/show_bug.cgi?id=524356
Diffstat (limited to 'rc.d/rc.sysinit')
-rwxr-xr-x | rc.d/rc.sysinit | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 0f5a8ec2..0d817f89 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -443,14 +443,13 @@ if [ -c /dev/mapper/control ]; then if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid.static ]; then modprobe dm-mirror >/dev/null 2>&1 - for x in $(/sbin/dmraid.static -ay -i -p -t 2>/dev/null | \ - egrep -iv "^no " | \ - awk -F ':' '{ print $1 }') ; do - dmname=$(resolve_dm_name $x) - [ -z "$dmname" ] && continue - /sbin/dmraid.static -ay -i -p "$dmname" >/dev/null 2>&1 - /sbin/kpartx -a -p p "/dev/mapper/$dmname" - done + dmraidsets=$(LC_ALL=C /sbin/dmraid -s -c -i) + if [ "$dmraidsets" != "no raid disks" ]; then + for dmname in $dmraidsets; do + /sbin/dmraid.static -ay -i -p "$dmname" >/dev/null 2>&1 + /sbin/kpartx -a -p p "/dev/mapper/$dmname" + done + fi fi if [ -x /sbin/lvm.static ]; then |