diff options
-rw-r--r-- | distrib/amiga/install.md | 5 | ||||
-rw-r--r-- | distrib/mvme88k/ramdisk/install.md | 15 | ||||
-rw-r--r-- | distrib/sparc/install.md | 5 | ||||
-rw-r--r-- | distrib/sun3/install.md | 5 | ||||
-rw-r--r-- | distrib/vax/install.md | 4 |
5 files changed, 14 insertions, 20 deletions
diff --git a/distrib/amiga/install.md b/distrib/amiga/install.md index 8e78cd2f12d..1c9d2516ce8 100644 --- a/distrib/amiga/install.md +++ b/distrib/amiga/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.13 2002/04/25 21:28:10 miod Exp $ +# $OpenBSD: install.md,v 1.14 2002/05/07 02:03:57 krw Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -48,8 +48,7 @@ md_set_term() { if [ ! -z "$TERM" ]; then return fi - echo -n "Specify terminal type [vt220]: " - getresp "vt220" + ask "Specify terminal type:" vt220 TERM="$resp" export TERM } diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md index 463e0419832..e607b74931f 100644 --- a/distrib/mvme88k/ramdisk/install.md +++ b/distrib/mvme88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.10 2002/04/25 21:28:13 miod Exp $ +# $OpenBSD: install.md,v 1.11 2002/05/07 02:03:57 krw Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -46,8 +46,7 @@ md_set_term() { if [ ! -z "$TERM" ]; then return fi - echo -n "Specify terminal type [xterm]: " - getresp "xterm" + ask "Specify terminal type:" xterm TERM="$resp" export TERM } @@ -123,17 +122,16 @@ md_prep_disklabel() _disk=$1 md_checkfordisklabel $_disk case $? in - 0) echo -n "Do you wish to edit the disklabel on $_disk? [y] " + 0) ask "Do you wish to edit the disklabel on $_disk?" y ;; 1) echo "WARNING: Disk $_disk has no label" - echo -n "Do you want to create one with the disklabel editor? [y] " + ask "Do you want to create one with the disklabel editor?" y ;; 2) echo "WARNING: Label on disk $_disk is corrupted" - echo -n "Do you want to try and repair the damage using the disklabel editor? [y] " + ask "Do you want to try and repair the damage using the disklabel editor?" y ;; esac - getresp "y" case "$resp" in y*|Y*) ;; *) return ;; @@ -162,8 +160,7 @@ in case you have defined less than sixteen partitions. [End of example] __EOT - echo -n "Press [Enter] to continue " - getresp "" + ask "Press [Enter] to continue" disklabel -W ${_disk} disklabel -f /tmp/fstab.${_disk} -E ${_disk} } diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index 5a10bedf3aa..7f6b5de0cd4 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.37 2002/03/31 17:30:31 deraadt Exp $ +# $OpenBSD: install.md,v 1.38 2002/05/07 02:03:57 krw Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -46,8 +46,7 @@ ARCH=ARCH md_set_term() { test -n "$TERM" && return - echo -n "Specify terminal type [sun]: " - getresp sun + ask "Specify terminal type:" sun TERM=$resp export TERM } diff --git a/distrib/sun3/install.md b/distrib/sun3/install.md index 8fcb57b1195..c1b5c3afd92 100644 --- a/distrib/sun3/install.md +++ b/distrib/sun3/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.5 2002/03/31 17:30:31 deraadt Exp $ +# $OpenBSD: install.md,v 1.6 2002/05/07 02:03:57 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -45,8 +45,7 @@ ARCH=ARCH md_set_term() { test -n "$TERM" && return - echo -n "Specify terminal type [sun]: " - getresp sun + ask "Specify terminal type:" sun TERM=$resp export TERM } diff --git a/distrib/vax/install.md b/distrib/vax/install.md index 7f57a61b5ce..ceacbb900ca 100644 --- a/distrib/vax/install.md +++ b/distrib/vax/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.10 2002/05/06 07:23:25 hugh Exp $ +# $OpenBSD: install.md,v 1.11 2002/05/07 02:03:57 krw Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -46,7 +46,7 @@ ARCH=ARCH md_set_term() { test -n "$TERM" && return - ask "Specify terminal type [vt100]: " vt100 + ask "Specify terminal type:" vt100 TERM=$resp export TERM } |