summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2002-05-20 02:45:09 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2002-05-20 02:45:09 +0000
commit9b3cd2f8f87cca7f2cd5cd1be885af6923448953 (patch)
treef46d123f174cb78743522cc035aaa794cd1b6bee /distrib
parent0941f810a27228c6231cdfab0f2347916aeddccf (diff)
Move verbiage about '!' and '!foo' at prompts to welcome_banner() from
separate here document. This moves it before first questions are asked, which makes more sense. Replace 'especially on a PC' with 'especially on a machine', since it is displayed on all installs/upgrades regardless of architecture.
Diffstat (limited to 'distrib')
-rw-r--r--distrib/miniroot/install.sub13
1 files changed, 5 insertions, 8 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index b3ee46176e1..20a69eb28e6 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.222 2002/05/18 17:56:03 krw Exp $
+# $OpenBSD: install.sub,v 1.223 2002/05/20 02:45:08 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
@@ -131,6 +131,9 @@ 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.
+
+At any prompt except password prompts you can run a shell command by
+typing '!foo', or escape to a shell by typing '!'.
__EOT
}
@@ -420,7 +423,7 @@ getrootdisk() {
The installation program needs to know which disk to consider the root disk.
Note the unit number may be different than the unit number you used in the
-boot program (especially on a PC with multiple disk controllers).
+boot program (especially on a machine with multiple disk controllers).
Available disks are:
$_DKDEVS
@@ -2224,9 +2227,3 @@ esac
# Deal with terminal issues
set_term
-
-cat << __EOT
-
-At any prompt except password prompts you can run a shell command by
-typing '!foo', or escape to a shell by typing '!'.
-__EOT