From 95e7d98b705456d3b3f86a07925657c69af2bf76 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 31 Jan 2006 22:15:20 +0000
Subject: - ignore the "I couldn't find anything to do" line, which we should
 remove   from dmraid entirely.

---
 rc.d/init.d/functions | 2 +-
 rc.d/rc.sysinit       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'rc.d')

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index ae9f4966..0a620eb3 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -493,7 +493,7 @@ resolve_dm_name() {
 (
     name="$1"
 
-    line=$(/sbin/dmraid -ay -t --ignorelocking | awk -F ':' "{ if (\$1 ~ /^$name$/) { print \$2; }}")
+    line=$(/sbin/dmraid -ay -t --ignorelocking | grep -v "No RAID disks" | awk -F ':' "{ if (\$1 ~ /^$name$/) { print \$2; }}")
     newline=$line
     for x in $line ; do
         if [[ "$x" =~ "^/dev/" ]] ; then
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 274c5f2c..90f14384 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -249,7 +249,7 @@ if [ -c /dev/mapper/control ]; then
 	
 	if [ -x /sbin/dmraid ]; then
 		modprobe dm-mirror >/dev/null 2>&1
-		for x in $(dmraid -ay -t --ignorelocking | awk -F ':' '{ print $1 }') ; do
+		for x in $(dmraid -ay -t --ignorelocking 2>/dev/null | grep -v "No RAID disks" | awk -F ':' '{ print $1 }') ; do
 			dmname=$(resolve_dm_name $x)
 			if [ -z "$dmname" ]; then
 				/sbin/dmraid -ay --ignorelocking "$dmname"
-- 
cgit v1.2.1