No point in checking disklabel output for 'disk label corrupted' message

since it isn't emitted anymore.

ok deraadt@

9 files changed, 9 insertions, 192 deletions

diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index afe5b5a5f7c..517d94935b9 100644
--- a/distrib/alpha/common/install.md
+++ b/distrib/alpha/common/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.22 2008/03/04 00:36:38 krw Exp $
+#       $OpenBSD: install.md,v 1.23 2008/03/22 23:28:10 krw Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -56,29 +56,9 @@ md_installboot() {
 	fi
 }
 
-# $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
 }
diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md
index 359c7137e31..c24e0a0a033 100644
--- a/distrib/hppa/install.md
+++ b/distrib/hppa/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.7 2008/03/04 00:36:38 krw Exp $
+#	$OpenBSD: install.md,v 1.8 2008/03/22 23:28:10 krw Exp $
 #
 # machine dependent section of installation/upgrade script.
 #
@@ -12,29 +12,9 @@ md_installboot() {
 	echo "done."
 }
 
-# $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
 }
diff --git a/distrib/luna88k/ramdisk/install.md b/distrib/luna88k/ramdisk/install.md
index ff93931b7ef..94f46c1e4c0 100644
--- a/distrib/luna88k/ramdisk/install.md
+++ b/distrib/luna88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.4 2008/03/04 00:36:38 krw Exp $
+#       $OpenBSD: install.md,v 1.5 2008/03/22 23:28:10 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -45,29 +45,9 @@ ARCH=ARCH
 md_installboot() {
 }
 
-# $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
 }
diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md
index 320fb00f925..53f47e185f6 100644
--- a/distrib/mvme68k/ramdisk/install.md
+++ b/distrib/mvme68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.29 2008/03/04 00:36:38 krw Exp $
+#       $OpenBSD: install.md,v 1.30 2008/03/22 23:28:10 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -47,29 +47,9 @@ md_installboot() {
 	/mnt/usr/mdec/installboot -v /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}a
 }
 
-# $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
 }
diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md
index 0183b80594c..dc4ce1bae15 100644
--- a/distrib/mvme88k/ramdisk/install.md
+++ b/distrib/mvme88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.25 2008/03/04 00:36:38 krw Exp $
+#       $OpenBSD: install.md,v 1.26 2008/03/22 23:28:10 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -47,29 +47,9 @@ md_installboot() {
 	/mnt/usr/mdec/installboot -v /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}a
 }
 
-# $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
 }
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md
index ca0886c3f26..87a3483d667 100644
--- a/distrib/sgi/ramdisk/install.md
+++ b/distrib/sgi/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.9 2008/03/04 00:36:38 krw Exp $
+#	$OpenBSD: install.md,v 1.10 2008/03/22 23:28:10 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -44,23 +44,6 @@ ARCH=ARCH
 md_installboot() {
 }
 
-md_checkfordisklabel() {
-	# $1 is the disk to check
-	local rval
-
-	disklabel $1 >/dev/null 2>/tmp/checkfordisklabel
-	if grep "no disk label" /tmp/checkfordisklabel; then
-		rval=1
-	elif grep "disk label corrupted" /tmp/checkfordisklabel; then
-		rval=2
-	else
-		rval=0
-	fi
-
-	rm -f /tmp/checkfordisklabel
-	return $rval
-}
-
 md_prep_disklabel()
 {
 	local _disk
@@ -159,12 +142,6 @@ end of the 'i' partition. This is the Volume Header and destroying it will
 render the disk useless.
 
 __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
 	disklabel -c -f /tmp/fstab.$_disk -E $_disk
 }
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
 }
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md
index 4c0c94e6ba5..9d6ee0c6032 100644
--- a/distrib/sparc64/common/install.md
+++ b/distrib/sparc64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.20 2008/03/04 00:36:38 krw Exp $
+#	$OpenBSD: install.md,v 1.21 2008/03/22 23:28:10 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -73,29 +73,9 @@ md_installboot() {
 	cp ${_prefix}/ofwboot /mnt/ofwboot
 }
 
-# $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
 }
diff --git a/distrib/vax/install.md b/distrib/vax/install.md
index dbfde364527..0ecf88b9d5c 100644
--- a/distrib/vax/install.md
+++ b/distrib/vax/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.26 2008/03/04 00:36:38 krw Exp $
+#	$OpenBSD: install.md,v 1.27 2008/03/22 23:28:10 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -52,29 +52,9 @@ md_installboot() {
 	/sbin/disklabel -B $1
 }
 
-# $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
 }