diff options
author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-03-23 14:03:56 +0000 |
---|---|---|
committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-03-23 14:03:56 +0000 |
commit | d0794972757ea5443cc958c37698461d47c29851 (patch) | |
tree | 5f1b1f58e2b976441179dea932361c9a8410748e /distrib/landisk/ramdisk | |
parent | 27f9b7890e2a72a56027ca5947f5bcdd15bb0e5b (diff) |
No point in warning users during install that the disklabel has a
weird number of partitions, doesn't checksum, doesn't exist or was
found at a particular sector. Brings all archs together in omerta by
eliminating use of '-r' and examination of disklabel messages.
ok deraadt@
Diffstat (limited to 'distrib/landisk/ramdisk')
-rw-r--r-- | distrib/landisk/ramdisk/install.md | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md index ab4e86d4fd9..3b1f50209e7 100644 --- a/distrib/landisk/ramdisk/install.md +++ b/distrib/landisk/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.13 2008/03/04 00:36:38 krw Exp $ +# $OpenBSD: install.md,v 1.14 2008/03/23 14:03:55 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -57,20 +57,6 @@ md_installboot() { echo "done." } -# $1 is the disk to check -md_checkfordisklabel() { - local rval=0 - - disklabel -r $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_fdisk() { local _disk=$1 @@ -123,12 +109,6 @@ start of the disk, NOT the start of the OpenBSD MBR partition. __EOT - 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 } |