diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-06-07 03:52:30 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-06-07 03:52:30 +0000 |
| commit | 6a8c3d741f412601425f903d5072591ddf561da6 (patch) | |
| tree | 3729bcf297bb8f35f1ff3e9656bd8a9609c60808 /distrib/miniroot | |
| parent | bc5fcbb23c4780ff812db39a3af75fd9f4036267 (diff) | |
More tersification. Fixes verbiage issue reported by jdixon@ on
icb.
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/dot.profile | 14 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 9 |
2 files changed, 10 insertions, 13 deletions
diff --git a/distrib/miniroot/dot.profile b/distrib/miniroot/dot.profile index 2be76f0182e..ad8026cc4e4 100644 --- a/distrib/miniroot/dot.profile +++ b/distrib/miniroot/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.11 2009/06/04 06:41:53 krw Exp $ +# $OpenBSD: dot.profile,v 1.12 2009/06/07 03:52:29 krw Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 2009 Kenneth R. Westerback @@ -57,21 +57,11 @@ stty newcrt werase ^W intr ^C kill ^U erase ^? status ^T cat <<__EOT Welcome to the $OBSD installation program. - -This program can install $OBSD, or upgrade an existing -OpenBSD installation. - -At any prompt except password prompts you can escape to a shell by -typing '!'. Default answers are shown in []'s and are selected by -pressing RETURN. At any time you can exit this program by pressing -Control-C, but exiting during an $MODE can leave your system in an -inconsistent state. - __EOT while :; do read REPLY?'(I)nstall, (U)pgrade or (S)hell? ' case $REPLY in - i*|I*) echo "\nCool! Let's get to it." + i*|I*) echo "\nCool! Let's get to it.\n" /install && break ;; u*|U*) cat <<__EOT diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index a13667d3ee9..1d5b4c283aa 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.574 2009/06/05 05:43:42 halex Exp $ +# $OpenBSD: install.sub,v 1.575 2009/06/07 03:52:29 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1818,6 +1818,13 @@ cd / [[ -f /etc/fstab ]] && umount -af 1>/dev/null 2>&1 umount /mnt 1>/dev/null 2>&1 +cat <<__EOT +At any prompt except password prompts you can escape to a shell by +typing '!'. Default answers are shown in []'s and are selected by +pressing RETURN. You can exit this program at any time by pressing +Control-C, but this can leave your system in an inconsistent state. +__EOT + # Configure the terminal and keyboard. set_term |