diff options
| author | David Cantrell <dcantrell@redhat.com> | 2010-02-12 09:51:23 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2010-02-12 09:51:23 -1000 |
| commit | c04faa27a88472dec0fea1909338ba01254cd71f (patch) | |
| tree | 154e765bb09384d0b0cc7b0b9ecb8b78602c35c5 | |
| parent | 401695ced69dd66bafe6b1dcf74cdd4dd6d8ad43 (diff) | |
| download | anaconda-c04faa27a88472dec0fea1909338ba01254cd71f.tar.gz anaconda-c04faa27a88472dec0fea1909338ba01254cd71f.tar.xz anaconda-c04faa27a88472dec0fea1909338ba01254cd71f.zip | |
Fix return values for dasd_settle_all() in linuxrc.s390 (#558881).
Also remove one call to dasd_settle_all(), which is not necessary.
| -rw-r--r-- | loader/linuxrc.s390 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index a766cbd29..83f5c94e5 100644 --- a/loader/linuxrc.s390 +++ b/loader/linuxrc.s390 @@ -153,10 +153,10 @@ function dasd_settle_all() { for dasdccw in $(cut -d '(' -f 1 /proc/dasd/devices) ; do if ! dasd_settle $dasdccw ; then echo $"Could not access DASD $dasdccw in time" - return 0 + return 1 fi done - return 1 + return 0 } function startinetd() @@ -2525,7 +2525,7 @@ function parse_dasd() { done < <(echo $DASD | sed 's/,/\n/g') if [ "$handle" = "yes" ]; then udevadm settle - dasd_settle_all || return 0 + dasd_settle_all || return 1 echo $"Activated DASDs:" cat /proc/dasd/devices | sed -e 's/ at ([^)]*) is//' -e 's/ at/,/' fi @@ -2720,7 +2720,6 @@ function final_check() { fi ;; d) # show active DASDs with some useful details - dasd_settle_all || return 0 echo $"Activated DASDs:" cat /proc/dasd/devices|sed -e 's/ at ([^)]*) is//' -e 's/ at/,/' ;; |