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@

1 files changed, 1 insertions, 61 deletions

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
 }