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 /rc.d/init.d | |
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
Diffstat (limited to 'rc.d/init.d')
-rwxr-xr-x | rc.d/init.d/functions | 4 |
1 files changed, 2 insertions, 2 deletions
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 } |