aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-08-07 17:04:56 +0000
committerBill Nottingham <notting@redhat.com>2006-08-07 17:04:56 +0000
commit68f9579a8110068e6a5791240a5b4d74d43bfd64 (patch)
treeba686be858789c6d9386e3cb7cae58310db61b1b
parent02b7bcde84fe0e10870fef468b502416698f13b8 (diff)
downloadinitscripts-68f9579a8110068e6a5791240a5b4d74d43bfd64.tar
initscripts-68f9579a8110068e6a5791240a5b4d74d43bfd64.tar.gz
initscripts-68f9579a8110068e6a5791240a5b4d74d43bfd64.tar.bz2
initscripts-68f9579a8110068e6a5791240a5b4d74d43bfd64.tar.xz
initscripts-68f9579a8110068e6a5791240a5b4d74d43bfd64.zip
catch more errors from dmraid (#200683)
-rwxr-xr-xrc.d/init.d/functions2
-rwxr-xr-xrc.d/rc.sysinit2
2 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 2576f463..0c278f8a 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -562,7 +562,7 @@ resolve_dm_name() {
(
name="$1"
- line=$(/sbin/dmraid -ay -t --ignorelocking | egrep -iv "no block devices found|No RAID disks" | awk -F ':' "{ if (\$1 ~ /^$name$/) { print \$2; }}")
+ line=$(/sbin/dmraid -ay -t --ignorelocking | egrep -iv "^[nN]o " | 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 c04a434d..2c68ff6f 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -414,7 +414,7 @@ if [ -c /dev/mapper/control ]; then
if [ -x /sbin/dmraid ]; then
modprobe dm-mirror >/dev/null 2>&1
- for x in $(/sbin/dmraid -ay -t --ignorelocking 2>/dev/null | egrep -iv "no block devices found|No RAID disks" | awk -F ':' '{ print $1 }') ; do
+ for x in $(/sbin/dmraid -ay -t --ignorelocking 2>/dev/null | egrep -iv "^[nN]o " | awk -F ':' '{ print $1 }') ; do
dmname=$(resolve_dm_name $x)
if [ -z "$dmname" ]; then
/sbin/dmraid -ay --ignorelocking "$x"