diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-09-21 02:11:43 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-09-21 02:11:43 +0000 |
| commit | 023bd3f8cfa6e289ad653beedceb21dcbcd02bb3 (patch) | |
| tree | 6a7370386a31fe3abb984d588f330fb27b38e9aa /distrib/mac68k | |
| parent | e70354929e99fcb6c23584851628242c3f4a4f22 (diff) | |
Fix extraneous display of grep output when searching disklabel output for
error information. Previously things like:
disklabel: no disk label
WARNING: Disk wd0 has no disk label. You will be creating a new one.
would be printed. Now the 'disklabel: no disk label' message is correctly
sent to /dev/null.
Take the opportunity to clean up a bit of code and formatting, making all
the md_checkfordisklabel() functions as identical as possible.
Diffstat (limited to 'distrib/mac68k')
| -rw-r--r-- | distrib/mac68k/ramdisk/install.md | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md index 109e336e908..a1bc567d3b3 100644 --- a/distrib/mac68k/ramdisk/install.md +++ b/distrib/mac68k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.19 2002/11/07 01:28:52 krw Exp $ +# $OpenBSD: install.md,v 1.20 2003/09/21 02:11:42 krw Exp $ # # Copyright (c) 2002, Miodrag Vallat. # All rights reserved. @@ -75,20 +75,19 @@ md_installboot() { : } +# $1 is the disk to check md_checkfordisklabel() { - # $1 is the disk to check - local rval + local rval=0 + + disklabel $1 >/dev/null 2>/tmp/checkfordisklabel - disklabel $1 > /dev/null 2> /tmp/checkfordisklabel if grep "no OpenBSD or MacOS disk label" /tmp/checkfordisklabel; then rval=1 elif grep "disk label corrupted" /tmp/checkfordisklabel; then rval=2 elif grep " HFS " /tmp/checkfordisklabel; then rval=3 - else - rval=0 - fi + fi >/dev/null 2>&1 rm -f /tmp/checkfordisklabel return $rval |