From d37a29944a09e2e129c3bae4a5d3ff690ea6eda1 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 26 Feb 2010 14:36:22 -0500
Subject: The current rawhide dmraid has proper error codes.

---
 initscripts.spec | 1 +
 rc.d/rc.sysinit  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.1