aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-02-26 14:30:28 -0500
committerBill Nottingham <notting@redhat.com>2010-02-26 14:30:28 -0500
commitcd45f75d2729c268bc3f1ebe1691749a3b18b09f (patch)
treed31bc879ecc166ba5742a6de36ad14f077a74877
parent9883cb1d38ae575c3902faf079890d47e63530a4 (diff)
downloadinitscripts-cd45f75d2729c268bc3f1ebe1691749a3b18b09f.tar
initscripts-cd45f75d2729c268bc3f1ebe1691749a3b18b09f.tar.gz
initscripts-cd45f75d2729c268bc3f1ebe1691749a3b18b09f.tar.bz2
initscripts-cd45f75d2729c268bc3f1ebe1691749a3b18b09f.tar.xz
initscripts-cd45f75d2729c268bc3f1ebe1691749a3b18b09f.zip
Check dmraid's return code, to catch 'no raid sets' error. (#568790)
In future dmraid versions, all the errors ('no raid disks', etc.) will return proper error codes, so we can dispense with the string checks as well.
-rwxr-xr-xrc.d/rc.sysinit2
1 files changed, 1 insertions, 1 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 324cb5d0..9736e859 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -360,7 +360,7 @@ fi
if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then
modprobe dm-mirror >/dev/null 2>&1
dmraidsets=$(LC_ALL=C /sbin/dmraid -s -c -i)
- if [ "$dmraidsets" != "no raid disks" -a "$dmraidsets" != "no block devices found" ]; then
+ if [ "$?" = "0" -a "$dmraidsets" != "no raid disks" -a "$dmraidsets" != "no block devices found" ]; then
for dmname in $dmraidsets; do
if [[ "$dmname" == isw_* ]] && \
! strstr "$cmdline" noiswmd; then