diff options
| author | Peter Jones <pjones@redhat.com> | 2006-02-14 18:41:21 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2006-02-14 18:41:21 +0000 |
| commit | 0120e26af5ddefc0a16faa9f6be752d7f5c2e864 (patch) | |
| tree | ae58a40b68e71b51d9595644fc69d15101dc148f | |
| parent | f90567bd14e74599303c366ff9ceeead8572c37e (diff) | |
| download | initscripts-0120e26af5ddefc0a16faa9f6be752d7f5c2e864.tar initscripts-0120e26af5ddefc0a16faa9f6be752d7f5c2e864.tar.gz initscripts-0120e26af5ddefc0a16faa9f6be752d7f5c2e864.tar.bz2 initscripts-0120e26af5ddefc0a16faa9f6be752d7f5c2e864.tar.xz initscripts-0120e26af5ddefc0a16faa9f6be752d7f5c2e864.zip | |
- filter out another "no" message from dmraid. We need to fix dmraid'sr8-29
exit status in these cases and use that in the future...
- add path to one dmraid call
- bump version, add changelog
| -rw-r--r-- | initscripts.spec | 5 | ||||
| -rwxr-xr-x | rc.d/init.d/functions | 4 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec index 008c028b..e807ef33 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.28 +Version: 8.29 License: GPL Group: System Environment/Base Release: 1 @@ -208,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Feb 14 2006 Peter Jones <pjones@redhat.com> 8.29-1 +- scrub another possible error message from dmraid output + * Mon Feb 13 2006 Bill Nottingham <notting@redhat.com> 8.28-1 - kill nash-hotplug before starting udev (<pjones@redhat.com>) - silence warnings on /dev/pts remount (<pjones@redhat.com>) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 521b4d0f..3db40360 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 | grep -v "No RAID disks" | awk -F ':' "{ if (\$1 ~ /^$name$/) { print \$2; }}") + line=$(/sbin/dmraid -ay -t --ignorelocking | egrep -iv "no block devices found|No RAID disks" | awk -F ':' "{ if (\$1 ~ /^$name$/) { print \$2; }}") newline=$line for x in $line ; do if [[ "$x" =~ "^/dev/" ]] ; then @@ -501,6 +501,6 @@ resolve_dm_name() { newline=$(echo $newline | sed -e "s,$x\( \|$\),$majmin\1,g") fi done - /sbin/dmsetup table | grep -v "No devices found" | sed -n "s/\(^[^:]\+\): $newline\( \+$\|$\)/\1/p" + /sbin/dmsetup table | egrep -iv "no block devices found|No devices found" | sed -n "s/\(^[^:]\+\): $newline\( \+$\|$\)/\1/p" ) 2>/dev/null } diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 8c0d3229..71d5bc79 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -259,7 +259,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 2>/dev/null | grep -v "No RAID disks" | awk -F ':' '{ print $1 }') ; do + 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 dmname=$(resolve_dm_name $x) if [ -z "$dmname" ]; then /sbin/dmraid -ay --ignorelocking "$x" |