aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-02-26 14:36:22 -0500
committerBill Nottingham <notting@redhat.com>2010-02-26 14:36:22 -0500
commitd37a29944a09e2e129c3bae4a5d3ff690ea6eda1 (patch)
tree953c314be3c9bd4f2b1801e974b9faa6736dc4ce
parentcd45f75d2729c268bc3f1ebe1691749a3b18b09f (diff)
downloadinitscripts-d37a29944a09e2e129c3bae4a5d3ff690ea6eda1.tar
initscripts-d37a29944a09e2e129c3bae4a5d3ff690ea6eda1.tar.gz
initscripts-d37a29944a09e2e129c3bae4a5d3ff690ea6eda1.tar.bz2
initscripts-d37a29944a09e2e129c3bae4a5d3ff690ea6eda1.tar.xz
initscripts-d37a29944a09e2e129c3bae4a5d3ff690ea6eda1.zip
The current rawhide dmraid has proper error codes.
-rw-r--r--initscripts.spec1
-rwxr-xr-xrc.d/rc.sysinit2
2 files changed, 2 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec
index a20c3c82..bc543daf 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -37,6 +37,7 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2
Conflicts: alsa-utils < 1.0.18
Conflicts: plymouth < 0.7.0-0.2009.02.26
Conflicts: s390utils < 2:1.8.2-11
+Conflicts: dmraid < 1.0.0.rc16-7
# http://bugzilla.redhat.com/show_bug.cgi?id=252973
Conflicts: nut < 2.2.0
Obsoletes: hotplug <= 3:2004_09_23-10.1
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 9736e859..803df568 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 [ "$?" = "0" -a "$dmraidsets" != "no raid disks" -a "$dmraidsets" != "no block devices found" ]; then
+ if [ "$?" = "0" ]; then
for dmname in $dmraidsets; do
if [[ "$dmname" == isw_* ]] && \
! strstr "$cmdline" noiswmd; then