summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Hall <halex@cvs.openbsd.org>2009-06-12 08:25:58 +0000
committerAlexander Hall <halex@cvs.openbsd.org>2009-06-12 08:25:58 +0000
commit4e5a2bbdc81c9a694a5db9940b048172090b7495 (patch)
tree61540c99b0d33c6883741cc01f6722908537ca8c
parent422e88b5c0051c6b8013aa5d7cd46bcc40e9c261 (diff)
make the interrupt handler in install.sub print a linefeed and also make
sure to enable echoing of the input to the tty ok krw@
-rw-r--r--distrib/miniroot/install.sub5
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index ba81cf98e20..25e9ef34c53 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.585 2009/06/12 03:25:24 krw Exp $
+# $OpenBSD: install.sub,v 1.586 2009/06/12 08:25:57 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
@@ -197,7 +197,8 @@ unlock() {
# Add trap to kill the listener process
retrap() {
- trap '>&- && kill -KILL $cppid 2>&-; exit' INT EXIT TERM
+ trap '>&- && kill -KILL $cppid 2>&-; echo; stty echo; exit 0' \
+ INT EXIT TERM
}
# The dmesg listener will check for the existance of this file and send a