Elminate md_welcome_banner() and md_not_going_to_install() as the

output of both was essentially identical on all architectures. Replace
with welcome_banner() and not_going_to_install() in install.sub.

Abstract common verbiage from md_congrats() into congrats() which
calls md_congrats() for any architecture specific additional verbiage.

Reword things so ${MODE} can be plausibly used in more places.

Remove extraneous #!/bin/sh in hp300 install.md.

ok deraadt@ espie@

14 files changed, 86 insertions, 806 deletions

diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index e1f53a0d8ff..2383e7fa069 100644
--- a/distrib/alpha/common/install.md
+++ b/distrib/alpha/common/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.6 2002/05/08 23:01:46 krw Exp $
+#       $OpenBSD: install.md,v 1.7 2002/05/09 21:54:46 krw Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -136,67 +136,7 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = install ]; then
-		cat << __EOT
-Welcome to the OpenBSD/alpha ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your system in a
-simple and rational way.
-__EOT
-	else
-		cat << __EOT
-Welcome to the OpenBSD/alpha ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a
-simple and rational way.
-
-As a reminder, installing the 'etc' binary set is NOT recommended.
-Once the rest of your system has been upgraded, you should manually
-merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this program can
-cause SIGNIFICANT data loss, and you are advised to make sure your
-data is backed up before beginning the installation process.
-
-Default answers are displayed in brackets after the questions.  You
-can hit Control-C at any time to quit, but if you do so at a prompt,
-you may have to hit return.  Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter 'halt' at the prompt to halt the machine.  Once the
-machine has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = install ]; then
-		what=installed
-	else
-		what=upgraded
-	fi
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully $what OpenBSD!
-To boot the installed system, enter halt at the command prompt. Once the
-system has halted, reset the machine and boot from the disk.
-
-__EOT
 }
 
 md_native_fstype() {
diff --git a/distrib/amiga/install.md b/distrib/amiga/install.md
index 0419f3c9828..f20209ccb9a 100644
--- a/distrib/amiga/install.md
+++ b/distrib/amiga/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.15 2002/05/08 23:01:46 krw Exp $
+#	$OpenBSD: install.md,v 1.16 2002/05/09 21:54:46 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -108,70 +108,10 @@ md_prep_disklabel()
 	esac
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = "install" ]; then
-		echo ""
-		echo "Welcome to the OpenBSD/amiga ${VERSION_MAJOR}.${VERSION_MINOR} installation program."
-		cat << __EOT
-
-This program is designed to help you put OpenBSD on your disk in a simple and
-rational way.
-__EOT
-
-	else
-		echo ""
-		echo "Welcome to the OpenBSD/amiga ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program."
-		cat << __EOT
-
-This program is designed to help you upgrade your OpenBSD system in a
-simple and rational way.
-
-As a reminder, installing the `etc' binary set is NOT recommended.
-Once the rest of your system has been upgraded, you should manually
-merge any changes to files in the `etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this
-program can cause SIGNIFICANT data loss, and you are advised
-to make sure your data is backed up before beginning the
-installation process.
-
-Default answers are displayed in brackets after the questions.
-You can hit Control-C at any time to quit, but if you do so at a
-prompt, you may have to hit return.  Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter `halt' at the prompt to halt the machine.  Once the
-machine has halted, power-cycle the system and you'll get back to AmigaOS.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = "install" ]; then
-		what="installed";
-	else
-		what="upgraded";
-	fi
 	cat << __EOT
 
-CONGRATULATIONS!  You have successfully $what OpenBSD!
-To boot the installed system, enter halt at the command prompt. Once the
-system has halted, reset the machine, enter AmigaOS and boot via loadbsd
-without the -b flag, per the install document.
-
+Once in AmigaOS, boot via loadbsd without the -b flag, as described
+in the install document.
 __EOT
 }
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md
index 892a138bce4..621d7322240 100644
--- a/distrib/hp300/ramdisk/install.md
+++ b/distrib/hp300/ramdisk/install.md
@@ -1,6 +1,4 @@
-#!/bin/sh
-#
-#	$OpenBSD: install.md,v 1.28 2002/05/08 23:01:46 krw Exp $
+#	$OpenBSD: install.md,v 1.29 2002/05/09 21:54:46 krw Exp $
 #	$NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -118,67 +116,7 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-# 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.
-
-md_welcome_banner() {
-(
-	if [ "$MODE" = "install" ]; then
-		echo "Welcome to the OpenBSD/hp300 ${VERSION_MAJOR}.${VERSION_MINOR} installation program."
-		cat << __EOT
-
-This program is designed to help you put OpenBSD on your system in a
-simple and rational way.
-__EOT
-
-	else
-		echo "Welcome to the OpenBSD/hp300 ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program."
-		cat << __EOT
-
-This program is designed to help you upgrade your OpenBSD system in a
-simple and rational way.
-
-As a reminder, installing the `etc' binary set is NOT recommended.
-Once the rest of your system has been upgraded, you should manually
-merge any changes to files in the `etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this program can
-cause SIGNIFICANT data loss, and you are advised to make sure your
-data is backed up before beginning the installation process.
-
-Default answers are displayed in brackets after the questions.  You
-can hit Control-C at any time to quit, but if you do so at a prompt,
-you may have to hit return.  Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__EOT
-) | less -E
-}
-
-md_not_going_to_install() {
-		cat << __EOT
-
-OK, then.  Enter 'halt' at the prompt to halt the machine.  Once the
-machine has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully installed OpenBSD!  To boot the
-installed system, enter halt at the command prompt.  Once the system has
-halted, power-cycle the machine in order to load new boot code.  Make sure
-you boot from the root disk.
-
-__EOT
 }
 
 md_native_fstype() {
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index c97d9b39732..0041b105d6b 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.3 2002/05/08 23:01:46 krw Exp $
+#	$OpenBSD: install.md,v 1.4 2002/05/09 21:54:46 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -241,65 +241,5 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = install ]; then
-		cat << __EOT
-Welcome to the OpenBSD/i386 ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your disk in a simple and
-rational way.
-__EOT
-
-	else
-		cat << __EOT
-Welcome to the OpenBSD/i386 ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a simple
-and rational way.  As a reminder, installing the 'etc' binary set is NOT
-recommended.  Once the rest of your system has been upgraded, you should
-manually merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this program can cause
-SIGNIFICANT data loss, and you are advised to make sure your data is backed
-up before beginning the installation process.
-
-Default answers are displayed in brackets after the questions.  You can hit
-Control-C at any time to quit, but if you do so at a prompt, you may have
-to hit return.  Also, quitting in the middle of installation may leave your
-system in an inconsistent state.  If you hit Control-C and restart the
-install, the install program will remember many of your old answers.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter 'halt' at the prompt to halt the machine.  Once the machine
-has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = install ]; then
-		what=installed
-	else
-		what=upgraded
-	fi
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully $what OpenBSD!  To boot the
-installed system, enter halt at the command prompt. Once the system has
-halted, reset the machine and boot from the disk.
-
-__EOT
 }
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index 8b0f46b6b54..d82e0b12bf3 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.10 2002/05/08 23:01:46 krw Exp $
+#       $OpenBSD: install.md,v 1.11 2002/05/09 21:54:46 krw Exp $
 #
 # Copyright (c) 2002, Miodrag Vallat.
 # All rights reserved.
@@ -147,65 +147,5 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = "install" ]; then
-		cat << __EOT
-Welcome to the OpenBSD/mac68k ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your disk, in a simple and
-rational way.
-__EOT
-
-	else
-		cat << __EOT
-Welcome to the OpenBSD/mac68k ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a simple
-and rational way.  As a reminder, installing the 'etc' binary set is NOT
-recommended.  Once the rest of your system has been upgraded, you should
-manually merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this
-program can cause SIGNIFICANT data loss, and you are advised
-to make sure your data is backed up before beginning the
-installation process.
-
-Default answers are displayed in brackets after the questions.
-You can hit Control-C at any time to quit, but if you do so at a
-prompt, you may have to hit return.  Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter `halt' at the prompt to halt the machine.  Once the
-machine has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = "install" ]; then
-		what="installed";
-	else
-		what="upgraded";
-	fi
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully $what OpenBSD!  To boot the
-installed system, enter halt at the command prompt. Once the system has
-halted, reset the machine and boot from the disk.
-
-__EOT
 }
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index 4699e6dceef..3db7ddc15a6 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.10 2002/05/08 23:14:53 krw Exp $
+#	$OpenBSD: install.md,v 1.11 2002/05/09 21:54:46 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -357,65 +357,10 @@ __EOT
 	fi
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = install ]; then
-		cat << __EOT
-Welcome to the OpenBSD/macppc ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your disk in a simple and
-rational way.
-__EOT
-
-	else
-		cat << __EOT
-Welcome to the OpenBSD/macppc ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a simple
-and rational way.  As a reminder, installing the 'etc' binary set is NOT
-recommended.  Once the rest of your system has been upgraded, you should
-manually merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this program can cause
-SIGNIFICANT data loss, and you are advised to make sure your data is backed
-up before beginning the installation process.
-
-Default answers are displayed in brackets after the questions.  You can hit
-Control-C at any time to quit, but if you do so at a prompt, you may have
-to hit return.  Also, quitting in the middle of installation may leave your
-system in an inconsistent state.  If you hit Control-C and restart the
-install, the install program will remember many of your old answers.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter 'reboot' at the prompt to reset the machine.  Once the machine
-has rebooted, use Open Firmware to load the new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = install ]; then
-		what=installed
-	else
-		what=upgraded
-	fi
 	cat << __EOT
 
-CONGRATULATIONS!  You have successfully $what OpenBSD!  To boot the
-installed system, enter reboot at the command prompt.  Once the machine
-has rebooted, use Open Firmware to boot into OpenBSD.
-
+Once the machine has rebooted use Open Firmware to boot into OpenBSD,
+as described in the install document.
 __EOT
 }
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index e1432b60504..ebc6e98a84a 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.219 2002/05/08 23:01:46 krw Exp $
+#	$OpenBSD: install.sub,v 1.220 2002/05/09 21:54:46 krw Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -76,10 +76,8 @@
 #	md_installboot()	  - install boot-blocks on disk
 #	md_native_fsopts()	  - native filesystem options for disk installs
 #	md_native_fstype()	  - native filesystem type for disk installs
-#	md_not_going_to_install() - display friendly message
 #	md_prep_disklabel()	  - label the root disk
 #	md_set_term()		  - set up terminal
-#	md_welcome_banner()	  - display friendly message
 #
 # The following variables can be provided if required:
 #	MDTERM           - 'vt220' assumed if not provided
@@ -94,6 +92,67 @@ set_term() {
 	md_set_term
 }
 
+
+welcome_banner() {
+	cat << __EOT
+
+Welcome to the OpenBSD/${ARCH} ${VERSION_MAJOR}.${VERSION_MINOR} ${MODE} program.
+
+This program will help you ${MODE} OpenBSD in a simple and rational way.
+__EOT
+
+	if [ "$MODE" = "upgrade" ]; then
+		cat << __EOT
+
+As a reminder, installing the 'etc' binary set is NOT recommended.
+Once the rest of your system has been upgraded, you should manually
+merge any changes to files in the 'etc' set into those files which
+already exist on your system.
+__EOT
+	else
+		cat << __EOT
+
+You'll be asked several questions, and it would probably be useful to
+have your disk's hardware manual, the installation notes, and a
+calculator handy.
+__EOT
+	fi
+
+	cat << __EOT
+
+As with anything that modifies your disk's contents, this program can
+cause SIGNIFICANT data loss, and you are advised to make sure your
+data is backed up before beginning the installation process.
+
+Default answers are displayed in brackets after the questions. You can
+hit Control-C at any time to quit, but if you do so at a prompt, you
+may have to hit return. Also, quitting in the middle of an ${MODE} may
+leave your system in an inconsistent state.
+
+If you hit Control-C and restart the ${MODE}, the ${MODE} program will
+remember many of your old answers.
+__EOT
+}
+
+not_going_to_install() {
+	cat << __EOT
+
+Enter 'halt' at the prompt to gracefully exit OpenBSD. You can then
+power cycle the machine and boot your original OS.
+__EOT
+}
+
+congrats() {
+	cat << __EOT
+
+CONGRATULATIONS! Your OpenBSD ${MODE} has been successfully completed!
+To boot the new system, enter halt at the command prompt. Once the
+system has halted, reset the machine and boot from the disk.
+__EOT
+
+	md_congrats
+}
+
 # Ask for a password, saving the input in $resp.
 #    Display $1 as the prompt.
 #    *Don't* allow the '!' options that ask does.
@@ -2087,7 +2146,7 @@ finish_up() {
 	cleanup_on_exit
 
 	# Pat on the back.
-	md_congrats
+	congrats
 
 	exit 0
 }
@@ -2137,11 +2196,11 @@ trap 'cleanup_on_exit' EXIT
 trap 'exit 2' HUP INT QUIT TERM
 
 # Good {morning,afternoon,evening,night}.
-echo
-md_welcome_banner
+welcome_banner | more
 
 if [ -f /etc/fstab -a "$MODE" = "install" ]; then
 	cat << __EOT
+
 You seem to be trying to restart an interrupted installation!
 You can skip the disk preparation steps and continue,
 or you can reboot and start over.
@@ -2149,14 +2208,14 @@ or you can reboot and start over.
 __EOT
 	echo -n "Skip disk initialization and p"
 else
-	echo -n "P"
+	echo -n "\nP"
 fi
 	
 ask "roceed with ${MODE}?" n
 case $resp in
 y*|Y*)	echo "\nCool!  Let's get to it...\n"
 	;;
-*)	md_not_going_to_install
+*)	not_going_to_install
 	exit
 	;;
 esac
diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md
index 7e1fab661b4..5b6081ad8b2 100644
--- a/distrib/mvme68k/ramdisk/install.md
+++ b/distrib/mvme68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.17 2002/05/08 23:01:47 krw Exp $
+#       $OpenBSD: install.md,v 1.18 2002/05/09 21:54:46 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -141,65 +141,5 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = "install" ]; then
-		cat << __EOT
-Welcome to the OpenBSD/mvme68k ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your disk, in a simple and
-rational way.
-__EOT
-
-	else
-		cat << __EOT
-Welcome to the OpenBSD/mvme68k ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a simple
-and rational way.  As a reminder, installing the 'etc' binary set is NOT
-recommended.  Once the rest of your system has been upgraded, you should
-manually merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this
-program can cause SIGNIFICANT data loss, and you are advised
-to make sure your data is backed up before beginning the
-installation process.
-
-Default answers are displayed in brackets after the questions.
-You can hit Control-C at any time to quit, but if you do so at a
-prompt, you may have to hit return.  Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter `halt' at the prompt to halt the machine.  Once the
-machine has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = "install" ]; then
-		what="installed";
-	else
-		what="upgraded";
-	fi
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully $what OpenBSD!  To boot the
-installed system, enter halt at the command prompt. Once the system has
-halted, reset the machine and boot from the disk.
-
-__EOT
 }
diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md
index b35b013addc..119fa964873 100644
--- a/distrib/mvme88k/ramdisk/install.md
+++ b/distrib/mvme88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.12 2002/05/08 23:01:47 krw Exp $
+#       $OpenBSD: install.md,v 1.13 2002/05/09 21:54:46 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -155,71 +155,7 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_welcome_banner() {
-	if [ "$MODE" = "install" ]; then
-		echo ""
-		echo "Welcome to the OpenBSD/mvme88k ${VERSION_MAJOR}.${VERSION_MINOR} installation program."
-		cat << __EOT
-
-This program is designed to help you put OpenBSD on your disk,
-in a simple and rational way.  You'll be asked several questions,
-and it would probably be useful to have your disk's hardware
-manual, the installation notes, and a calculator handy.
-__EOT
-
-	else
-		echo ""
-		echo "Welcome to the OpenBSD/mvme88k ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program."
-		cat << __EOT
-
-This program is designed to help you upgrade your OpenBSD system in a
-simple and rational way.
-
-As a reminder, installing the `etc' binary set is NOT recommended.
-Once the rest of your system has been upgraded, you should manually
-merge any changes to files in the `etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this
-program can cause SIGNIFICANT data loss, and you are advised
-to make sure your data is backed up before beginning the
-installation process.
-
-Default answers are displayed in brackets after the questions.
-You can hit Control-C at any time to quit, but if you do so at a
-prompt, you may have to hit return.  Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__EOT
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter `halt' at the prompt to halt the machine.  Once the
-machine has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = "install" ]; then
-		what="installed";
-	else
-		what="upgraded";
-	fi
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully $what OpenBSD!
-To boot the installed system, enter halt at the command prompt. Once the
-system has halted, reset the machine and boot from the disk.
-
-__EOT
 }
 
 md_native_fstype() {
diff --git a/distrib/mvmeppc/ramdisk/install.md b/distrib/mvmeppc/ramdisk/install.md
index 0883f5f2614..44ae33ec59f 100644
--- a/distrib/mvmeppc/ramdisk/install.md
+++ b/distrib/mvmeppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.9 2002/05/08 23:01:47 krw Exp $
+#	$OpenBSD: install.md,v 1.10 2002/05/09 21:54:46 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -337,65 +337,10 @@ __EOT
 	fi
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = install ]; then
-		cat << __EOT
-Welcome to the OpenBSD/mvmeppc ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your disk in a simple and
-rational way.
-__EOT
-
-	else
-		cat << __EOT
-Welcome to the OpenBSD/mvmeppc ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a simple
-and rational way.  As a reminder, installing the 'etc' binary set is NOT
-recommended.  Once the rest of your system has been upgraded, you should
-manually merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this program can cause
-SIGNIFICANT data loss, and you are advised to make sure your data is backed
-up before beginning the installation process.
-
-Default answers are displayed in brackets after the questions.  You can hit
-Control-C at any time to quit, but if you do so at a prompt, you may have
-to hit return.  Also, quitting in the middle of installation may leave your
-system in an inconsistent state.  If you hit Control-C and restart the
-install, the install program will remember many of your old answers.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter 'reboot' at the prompt to reset the machine.  Once the machine
-has rebooted, use Open Firmware to load the new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = install ]; then
-		what=installed
-	else
-		what=upgraded
-	fi
 	cat << __EOT
 
-CONGRATULATIONS!  You have successfully $what OpenBSD!  To boot the
-installed system, enter reboot at the command prompt.  Once the machine
-has rebooted, use Open Firmware to boot into OpenBSD.
-
+Once the machine has rebooted use Open Firmware to boot into OpenBSD,
+as described in the install document.
 __EOT
 }
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index b1eda8ffdde..1d744da0a57 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.39 2002/05/08 23:01:47 krw Exp $
+#	$OpenBSD: install.md,v 1.40 2002/05/09 21:54:46 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -152,66 +152,5 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = install ]; then
-		cat << __EOT
-Welcome to the OpenBSD/sparc ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your disk in a simple and
-rational way.
-__EOT
-
-	else
-		cat << __EOT
-Welcome to the OpenBSD/sparc ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a
-simple and rational way.
-
-As a reminder, installing the 'etc' binary set is NOT recommended.
-Once the rest of your system has been upgraded, you should manually
-merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this program can
-cause SIGNIFICANT data loss, and you are advised to make sure your
-data is backed up before beginning the installation process.
-
-Default answers are displayed in brackets after the questions.  You
-can hit Control-C at any time to quit, but if you do so at a prompt,
-you may have to hit return.  Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter 'halt' at the prompt to halt the machine.  Once the
-machine has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = install ]; then
-		what=installed
-	else
-		what=upgraded
-	fi
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully $what OpenBSD!
-To boot the installed system, enter halt at the command prompt. Once the
-system has halted, reset the machine and boot from the disk.
-
-__EOT
 }
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md
index bd02a2d05a2..e9ff7ae3fc4 100644
--- a/distrib/sparc64/common/install.md
+++ b/distrib/sparc64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.8 2002/05/08 23:01:47 krw Exp $
+#	$OpenBSD: install.md,v 1.9 2002/05/09 21:54:46 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -175,66 +175,5 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = install ]; then
-		cat << __EOT
-Welcome to the OpenBSD/sparc64 ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your disk in a simple and
-rational way.
-__EOT
-
-	else
-		cat << __EOT
-Welcome to the OpenBSD/sparc64 ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a
-simple and rational way.
-
-As a reminder, installing the 'etc' binary set is NOT recommended.
-Once the rest of your system has been upgraded, you should manually
-merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this program can
-cause SIGNIFICANT data loss, and you are advised to make sure your
-data is backed up before beginning the installation process.
-
-Default answers are displayed in brackets after the questions.  You
-can hit Control-C at any time to quit, but if you do so at a prompt,
-you may have to hit return.  Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter 'halt' at the prompt to halt the machine.  Once the
-machine has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = install ]; then
-		what=installed
-	else
-		what=upgraded
-	fi
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully $what OpenBSD!
-To boot the installed system, enter halt at the command prompt. Once the
-system has halted, reset the machine and boot from the disk.
-
-__EOT
 }
diff --git a/distrib/sun3/install.md b/distrib/sun3/install.md
index 82f07c76752..2e378bce20a 100644
--- a/distrib/sun3/install.md
+++ b/distrib/sun3/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.7 2002/05/08 23:01:47 krw Exp $
+#	$OpenBSD: install.md,v 1.8 2002/05/09 21:54:46 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -151,66 +151,5 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = install ]; then
-		cat << __EOT
-Welcome to the OpenBSD/sun3 ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your disk in a simple and
-rational way.
-__EOT
-
-	else
-		cat << __EOT
-Welcome to the OpenBSD/sun3 ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a
-simple and rational way.
-
-As a reminder, installing the 'etc' binary set is NOT recommended.
-Once the rest of your system has been upgraded, you should manually
-merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this program can
-cause SIGNIFICANT data loss, and you are advised to make sure your
-data is backed up before beginning the installation process.
-
-Default answers are displayed in brackets after the questions.  You
-can hit Control-C at any time to quit, but if you do so at a prompt,
-you may have to hit return.  Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter 'halt' at the prompt to halt the machine.  Once the
-machine has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = install ]; then
-		what=installed
-	else
-		what=upgraded
-	fi
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully $what OpenBSD!
-To boot the installed system, enter halt at the command prompt. Once the
-system has halted, reset the machine and boot from the disk.
-
-__EOT
 }
diff --git a/distrib/vax/install.md b/distrib/vax/install.md
index d782ee97a82..eaa0a8acb5d 100644
--- a/distrib/vax/install.md
+++ b/distrib/vax/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.12 2002/05/08 23:01:47 krw Exp $
+#	$OpenBSD: install.md,v 1.13 2002/05/09 21:54:46 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -134,65 +134,5 @@ __EOT
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
 }
 
-md_welcome_banner() {
-{
-	if [ "$MODE" = install ]; then
-		cat << __EOT
-Welcome to the OpenBSD/vax ${VERSION_MAJOR}.${VERSION_MINOR} installation program.
-
-This program is designed to help you put OpenBSD on your disk in a simple and
-rational way.
-__EOT
-
-	else
-		cat << __EOT
-Welcome to the OpenBSD/vax ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program.
-
-This program is designed to help you upgrade your OpenBSD system in a simple
-and rational way.  As a reminder, installing the 'etc' binary set is NOT
-recommended.  Once the rest of your system has been upgraded, you should
-manually merge any changes to files in the 'etc' set into those files which
-already exist on your system.
-__EOT
-	fi
-
-cat << __EOT
-
-As with anything which modifies your disk's contents, this program can cause
-SIGNIFICANT data loss, and you are advised to make sure your data is backed
-up before beginning the installation process.
-
-Default answers are displayed in brackets after the questions.  You can hit
-Control-C at any time to quit, but if you do so at a prompt, you may have
-to hit return.  Also, quitting in the middle of installation may leave your
-system in an inconsistent state.  If you hit Control-C and restart the
-install, the install program will remember many of your old answers.
-
-__EOT
-} | more
-}
-
-md_not_going_to_install() {
-	cat << __EOT
-
-OK, then.  Enter 'halt' at the prompt to halt the machine.  Once the machine
-has halted, power-cycle the system to load new boot code.
-
-__EOT
-}
-
 md_congrats() {
-	local what;
-	if [ "$MODE" = install ]; then
-		what=installed
-	else
-		what=upgraded
-	fi
-	cat << __EOT
-
-CONGRATULATIONS!  You have successfully $what OpenBSD!  To boot the
-installed system, enter halt at the command prompt. Once the system has
-halted, reset the machine and boot from the disk.
-
-__EOT
 }