From b54c147624144f460d90bd19a18589c189c6a19e Mon Sep 17 00:00:00 2001
From: Kenneth R Westerback <krw@cvs.openbsd.org>
Date: Fri, 19 Sep 2003 01:05:35 +0000
Subject: Excise more unused code.

md_installboot() is only called from one place, with $ROOTDEV as the
parameter.  $ROOTDEV is guaranteed to be set to a valid device so
don't bother testing it.

And if the user deliberately unsets ROOTDEV the installboot will fail
trying to use /dev/rc.
---
 distrib/alpha/common/install.md   | 10 ++--------
 distrib/sparc/install.md          | 10 ++--------
 distrib/sparc64/common/install.md | 10 ++--------
 3 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'distrib')

diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index 194f2497200..329fbe56cf7 100644
--- a/distrib/alpha/common/install.md
+++ b/distrib/alpha/common/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.15 2002/11/07 01:28:51 krw Exp $
+#       $OpenBSD: install.md,v 1.16 2003/09/19 01:05:34 krw Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -45,13 +45,7 @@ md_set_term() {
 }
 
 md_installboot() {
-	local _rawdev
-
-	if [ -z "$1" ]; then
-		echo No disk device specified, you must run installboot manually.
-		return
-	fi
-	_rawdev=/dev/r${1}c
+	local _rawdev=/dev/r${1}c
 
 	# use extracted mdec if it exists (may be newer)
 	if [ -d /mnt/usr/mdec ]; then
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index 7d38d5536aa..b52b347fd8c 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.47 2002/11/07 01:28:52 krw Exp $
+#	$OpenBSD: install.md,v 1.48 2003/09/19 01:05:34 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -48,13 +48,7 @@ md_set_term() {
 }
 
 md_installboot() {
-	local _rawdev _prefix
-
-	if [ -z "$1" ]; then
-		echo No disk device specified, you must run installboot manually.
-		return
-	fi
-	_rawdev=/dev/r${1}c
+	local _rawdev=/dev/r${1}c _prefix
 
 	# use extracted mdec if it exists (may be newer)
 	if [ -e /mnt/usr/mdec/boot ]; then
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md
index a95c9e1077c..8368b856668 100644
--- a/distrib/sparc64/common/install.md
+++ b/distrib/sparc64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.15 2002/11/07 01:28:52 krw Exp $
+#	$OpenBSD: install.md,v 1.16 2003/09/19 01:05:34 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -48,13 +48,7 @@ md_set_term() {
 }
 
 md_installboot() {
-	local _rawdev _prefix
-
-	if [ -z "$1" ]; then
-		echo No disk device specified, you must run installboot manually.
-		return
-	fi
-	_rawdev=/dev/r${1}c
+	local _rawdev=/dev/r${1}c _prefix
 
 	# use extracted mdec if it exists (may be newer)
 	if [ -e /mnt/usr/mdec/bootblk ]; then
-- 
cgit v1.2.3