diff options
author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-03-22 23:28:11 +0000 |
---|---|---|
committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-03-22 23:28:11 +0000 |
commit | a1ad6fe881fb8ae1b32b37052bd0170c1364134c (patch) | |
tree | fb98e82a073348d05ab51841be77594d03514f54 /distrib/sparc | |
parent | 4ac010668e431238d67a9bcc7af35fce2ced9411 (diff) |
No point in checking disklabel output for 'disk label corrupted' message
since it isn't emitted anymore.
ok deraadt@
Diffstat (limited to 'distrib/sparc')
-rw-r--r-- | distrib/sparc/install.md | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index 55b964f21aa..e1258bb8280 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.53 2008/03/04 00:36:38 krw Exp $ +# $OpenBSD: install.md,v 1.54 2008/03/22 23:28:10 krw Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -63,29 +63,9 @@ md_installboot() { installboot -v /mnt/boot ${_prefix}/bootxx ${_rawdev} } -# $1 is the disk to check -md_checkfordisklabel() { - local rval=0 - - disklabel $1 >/dev/null 2>/tmp/checkfordisklabel - - if grep "disk label corrupted" /tmp/checkfordisklabel; then - rval=2 - fi >/dev/null 2>&1 - - rm -f /tmp/checkfordisklabel - return $rval -} - md_prep_disklabel() { local _disk=$1 - md_checkfordisklabel $_disk - case $? in - 2) echo "WARNING: Label on disk $_disk is corrupted. You will be repairing it.\n" - ;; - esac - disklabel -W $_disk >/dev/null 2>&1 disklabel -f /tmp/fstab.$_disk -E $_disk } |