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:36:54 -0500
commit96d395f8aa81bce663fed2a67abc172500ee59a2 (patch)
treede531d338ebcc75cfc10acd1211f632a2f0373c0
parent7f98d014a32fbf9fa4510e87549e2d1436b0599a (diff)
downloadinitscripts-96d395f8aa81bce663fed2a67abc172500ee59a2.tar
initscripts-96d395f8aa81bce663fed2a67abc172500ee59a2.tar.gz
initscripts-96d395f8aa81bce663fed2a67abc172500ee59a2.tar.bz2
initscripts-96d395f8aa81bce663fed2a67abc172500ee59a2.tar.xz
initscripts-96d395f8aa81bce663fed2a67abc172500ee59a2.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 24285a35..dacf3169 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