From 383fc9e4ed80c339339a91feeb3736ff637e84b8 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 9 Oct 2009 16:18:04 -0400
Subject: dmraid can return 'no raid disks' to stdout. Handle it. (#527726,
 <mschmidt@redhat.com>)

---
 rc.d/rc.sysinit | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'rc.d/rc.sysinit')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index f0dc35d7..a243d8bd 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -362,14 +362,17 @@ fi
 	
 	if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then
 		modprobe dm-mirror >/dev/null 2>&1
-		for dmname in $(/sbin/dmraid -s -c -i); do
-			if [[ "$dmname" =~ '^isw_.*' ]] && \
-			   ! strstr "$cmdline" noiswmd; then
-				continue
-			fi
-			/sbin/dmraid -ay -i --rm_partitions -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
+				if [[ "$dmname" =~ '^isw_.*' ]] && \
+				   ! strstr "$cmdline" noiswmd; then
+					continue
+				fi
+				/sbin/dmraid -ay -i --rm_partitions -p "$dmname" >/dev/null 2>&1
+				/sbin/kpartx -a -p p "/dev/mapper/$dmname"
+			done
+		fi
 	fi
 	
 	if [ -x /sbin/lvm ]; then
-- 
cgit v1.2.1