aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2006-01-31 22:15:20 +0000
committerPeter Jones <pjones@redhat.com>2006-01-31 22:15:20 +0000
commit95e7d98b705456d3b3f86a07925657c69af2bf76 (patch)
treeda474141eb9e049b9d417874dab61bbd1ef59c7d
parentfa3de17506bd871f3baccfdfea9fecb6ce5acf2c (diff)
downloadinitscripts-95e7d98b705456d3b3f86a07925657c69af2bf76.tar
initscripts-95e7d98b705456d3b3f86a07925657c69af2bf76.tar.gz
initscripts-95e7d98b705456d3b3f86a07925657c69af2bf76.tar.bz2
initscripts-95e7d98b705456d3b3f86a07925657c69af2bf76.tar.xz
initscripts-95e7d98b705456d3b3f86a07925657c69af2bf76.zip
- ignore the "I couldn't find anything to do" line, which we should remove
from dmraid entirely.
-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 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"