Kill md_copy_kernel()

14 files changed, 17 insertions, 92 deletions

diff --git a/distrib/alpha/ramdisk/install.md b/distrib/alpha/ramdisk/install.md
index 095f993342a..83a22e4a62a 100644
--- a/distrib/alpha/ramdisk/install.md
+++ b/distrib/alpha/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.31 1999/07/30 17:16:02 deraadt Exp $
+#       $OpenBSD: install.md,v 1.32 1999/08/15 10:05:04 millert Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -49,10 +49,6 @@ md_machine_arch() {
 	cat /kern/machine
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 md_set_term() {
 	test -n "$TERM" && return
 	echo -n "Specify terminal type [sun]: "
diff --git a/distrib/amiga/install.md b/distrib/amiga/install.md
index 58b4f61d971..fc69eeeb9c8 100644
--- a/distrib/amiga/install.md
+++ b/distrib/amiga/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.7 1998/10/28 17:53:28 millert Exp $
+#	$OpenBSD: install.md,v 1.8 1999/08/15 10:05:04 millert Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -142,10 +142,6 @@ md_prep_disklabel()
 	esac
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 md_welcome_banner() {
 {
 	if [ "$MODE" = "install" ]; then
diff --git a/distrib/arc/ramdisk/install.md b/distrib/arc/ramdisk/install.md
index c0abdb5bef2..7465a81b38d 100644
--- a/distrib/arc/ramdisk/install.md
+++ b/distrib/arc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.11 1999/07/30 17:16:03 deraadt Exp $
+#	$OpenBSD: install.md,v 1.12 1999/08/15 10:05:06 millert Exp $
 #
 #
 # Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -349,10 +349,6 @@ __md_prep_disklabel_1
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 md_welcome_banner() {
 {
 	if [ "$MODE" = "install" ]; then
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md
index 8847e7f0191..368624793a1 100644
--- a/distrib/hp300/ramdisk/install.md
+++ b/distrib/hp300/ramdisk/install.md
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$OpenBSD: install.md,v 1.17 1999/04/01 04:39:50 millert Exp $
+#	$OpenBSD: install.md,v 1.18 1999/08/15 10:05:04 millert Exp $
 #	$NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -393,10 +393,6 @@ __md_prep_disklabel_1
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 # Note, while they might not seem machine-dependent, the
 # welcome banner and the punt message may contain information
 # and/or instructions specific to the type of machine.
diff --git a/distrib/i386/floppies/common/install.md b/distrib/i386/floppies/common/install.md
index e1048e3bd96..fb77fd05f30 100644
--- a/distrib/i386/floppies/common/install.md
+++ b/distrib/i386/floppies/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.1 1999/08/06 20:49:08 deraadt Exp $
+#	$OpenBSD: install.md,v 1.2 1999/08/15 10:05:05 millert Exp $
 #
 #
 # Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -210,10 +210,6 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 md_welcome_banner() {
 {
 	if [ "$MODE" = install ]; then
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index 845f01fbc58..90213a40487 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$OpenBSD: install.md,v 1.1 1999/06/13 10:33:31 downsj Exp $
+#	$OpenBSD: install.md,v 1.2 1999/08/15 10:05:05 millert Exp $
 #	$NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -140,10 +140,6 @@ md_prep_disklabel()
 	# We don't have disklabels.
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 # Note, while they might not seem machine-dependent, the
 # welcome banner and the punt message may contain information
 # and/or instructions specific to the type of machine.
diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md
index a00710c5730..6c159ce4987 100644
--- a/distrib/mvme68k/ramdisk/install.md
+++ b/distrib/mvme68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.6 1999/04/01 21:30:31 deraadt Exp $
+#       $OpenBSD: install.md,v 1.7 1999/08/15 10:05:06 millert Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -42,9 +42,8 @@
 TMPWRITEABLE=/tmp/writeable
 KERNFSMOUNTED=/tmp/kernfsmounted
 
-md_copy_kernel() {
-	echo "This must be done later by hand"
-}
+# Machine-dependent install sets
+MDSETS=kernel
 
 md_set_term() {
 	if [ ! -z "$TERM" ]; then
diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md
index 56dbcdf21ab..c031bc25bfe 100644
--- a/distrib/mvme88k/ramdisk/install.md
+++ b/distrib/mvme88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.2 1999/04/01 21:30:34 deraadt Exp $
+#       $OpenBSD: install.md,v 1.3 1999/08/15 10:05:07 millert Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -42,26 +42,6 @@
 TMPWRITEABLE=/tmp/writeable
 KERNFSMOUNTED=/tmp/kernfsmounted
 
-md_copy_kernel() {
-	if [ ! -s /mnt/bsd ]; then
-		echo	""
-		echo	"Warning, no kernel installed!"
-		echo	"You did not unpack a file set containing a kernel."
-		echo	"This is needed to boot.  Please note that the install"
-		echo	"install kernel is not suitable for general use."
-		echo -n	"Escape to shell add /mnt/bsd by hand? [y] "
-		getresp "y"
-		case "$resp" in
-			y*|Y*)
-				echo "Type 'exit' to return to install."
-				sh
-				;;
-			*)
-				;;
-		esac
-	fi
-}
-
 md_set_term() {
 	if [ ! -z "$TERM" ]; then
 		return
diff --git a/distrib/pmax/install.md b/distrib/pmax/install.md
index 862789c634f..4140bb4f318 100644
--- a/distrib/pmax/install.md
+++ b/distrib/pmax/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.11 1999/04/01 21:30:41 deraadt Exp $
+#	$OpenBSD: install.md,v 1.12 1999/08/15 10:05:07 millert Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -45,8 +45,7 @@ TMPWRITEABLE=/tmp/writeable
 KERNFSMOUNTED=/tmp/kernfsmounted
 
 # Machine-dependent install sets
-MDSETS=""
-# TTT MDSETS="xbin xman xinc xcon"
+MDSETS=kernel
 
 md_set_term() {
 	if [ ! -z "$TERM" ]; then
@@ -196,12 +195,6 @@ __md_prep_disklabel_1
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_copy_kernel() {
-	echo -n "Copying kernel..."
-	cp -p /bsd /mnt/bsd
-	echo "done."
-}
-
 md_welcome_banner() {
 {
 	if [ "$MODE" = "install" ]; then
diff --git a/distrib/pmax/ramdisk/install.md b/distrib/pmax/ramdisk/install.md
index a772467d569..96430ef8595 100644
--- a/distrib/pmax/ramdisk/install.md
+++ b/distrib/pmax/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.4 1999/07/30 17:16:09 deraadt Exp $
+#       $OpenBSD: install.md,v 1.5 1999/08/15 10:05:07 millert Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -49,10 +49,6 @@ md_machine_arch() {
 	cat /kern/machine
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 md_set_term() {
 	if [ ! -z "$TERM" ]; then
 		return
diff --git a/distrib/powerpc/ramdisk/install.md b/distrib/powerpc/ramdisk/install.md
index de38db8f753..1489b57d127 100644
--- a/distrib/powerpc/ramdisk/install.md
+++ b/distrib/powerpc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.10 1999/07/30 17:16:10 deraadt Exp $
+#	$OpenBSD: install.md,v 1.11 1999/08/15 10:05:07 millert Exp $
 #
 #
 # Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -326,10 +326,6 @@ __md_prep_disklabel_1
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 md_welcome_banner() {
 {
 	if [ "$MODE" = "install" ]; then
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index c04fafc2f5f..11116c6dfae 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.27 1999/04/02 05:17:37 millert Exp $
+#	$OpenBSD: install.md,v 1.28 1999/08/15 10:05:05 millert Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -204,10 +204,6 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 md_welcome_banner() {
 {
 	if [ "$MODE" = install ]; then
diff --git a/distrib/sun3/common/install.md b/distrib/sun3/common/install.md
index 8b90f6d6335..f806729d632 100644
--- a/distrib/sun3/common/install.md
+++ b/distrib/sun3/common/install.md
@@ -41,8 +41,7 @@
 #
 
 # Machine-dependent install sets
-# MDSETS="xbin xman xinc xcon" XXX
-MDSETS=""
+MDSETS=kernel
 
 md_set_term() {
 	if [ ! -z "$TERM" ]; then
@@ -192,12 +191,6 @@ __md_prep_disklabel_1
 	edlabel /dev/r${_disk}c
 }
 
-md_copy_kernel() {
-	echo -n "Copying kernel..."
-	cp -p /netbsd /mnt/netbsd
-	echo "done."
-}
-
 md_welcome_banner() {
 	if [ "$MODE" = "install" ]; then
 		echo ""
diff --git a/distrib/sun3/ramdisk/install.md b/distrib/sun3/ramdisk/install.md
index 7bcca4b0afb..e787feb2a89 100644
--- a/distrib/sun3/ramdisk/install.md
+++ b/distrib/sun3/ramdisk/install.md
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$OpenBSD: install.md,v 1.5 1998/11/09 04:00:10 millert Exp $
+#	$OpenBSD: install.md,v 1.6 1999/08/15 10:05:06 millert Exp $
 #	$NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -333,10 +333,6 @@ __md_prep_disklabel_1
 	disklabel -E ${_disk}
 }
 
-md_copy_kernel() {
-	check_kernel
-}
-
 # Note, while they might not seem machine-dependent, the
 # welcome banner and the punt message may contain information
 # and/or instructions specific to the type of machine.