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@

1 files changed, 1 insertions, 21 deletions

diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 9e35a246fb1..845a1bbf139 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.8 2008/03/04 00:36:38 krw Exp $
+#	$OpenBSD: install.md,v 1.9 2008/03/23 14:03:55 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,20 +49,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
 
@@ -115,12 +101,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
 }