diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2010-06-30 20:22:02 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2010-06-30 20:22:02 +0000 |
| commit | 7aca8a33a30ce915822f53d039e3fed8ad3f13f9 (patch) | |
| tree | c785c50527f2e60615dac66f5ba42b0842f66ae5 /distrib/miniroot | |
| parent | 257eead1eaf79cdd4c0b3d2f51fd19755aa9018d (diff) | |
revert last ^D behaviour change
requested and well explained by krw@
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/dot.profile | 5 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/distrib/miniroot/dot.profile b/distrib/miniroot/dot.profile index e6f70ee3842..757cfbffce9 100644 --- a/distrib/miniroot/dot.profile +++ b/distrib/miniroot/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.15 2010/06/30 19:31:19 halex Exp $ +# $OpenBSD: dot.profile,v 1.16 2010/06/30 20:22:01 halex Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 2009 Kenneth R. Westerback @@ -61,7 +61,8 @@ if [ "X${DONEPROFILE}" = "X" ]; then Welcome to the $OBSD installation program. __EOT - while read REPLY?'(I)nstall, (U)pgrade or (S)hell? '; do + while :; do + read REPLY?'(I)nstall, (U)pgrade or (S)hell? ' case $REPLY in i*|I*) /install && break ;; diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index dbf00ee7d50..49e25d8ed7a 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.608 2010/06/30 19:31:19 halex Exp $ +# $OpenBSD: install.sub,v 1.609 2010/06/30 20:22:01 halex 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 @@ -175,7 +175,7 @@ mount_mnt2() { askpass() { set -o noglob stty -echo - read -r resp?"$1 " || exit 1 + read -r resp?"$1 " stty echo set +o noglob echo @@ -227,18 +227,16 @@ retrap # and the function will return a non-zero value. Normally, the caller # will then reprint any prompt and call the function again. _ask() { - local _int _redo=0 _pid _fail + local _int _redo=0 _pid trap "_int=1" INT trap "_redo=1" TERM lock; dmesg >/tmp/update; unlock - read resp || _fail=1 + read resp lock; rm /tmp/update; unlock if (( _redo )); then stty raw stty -raw - elif [[ -n $_fail ]]; then - exit 1 else case $resp in !) echo "Type 'exit' to return to install." |