summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Hall <halex@cvs.openbsd.org>2013-11-14 15:20:55 +0000
committerAlexander Hall <halex@cvs.openbsd.org>2013-11-14 15:20:55 +0000
commit8b95c3465fab02432a6e6b38bedf09a8bd96b1e1 (patch)
tree40a3ae6265d8f262f87bbe98792555b02e3469b0
parentc8025783d44ce4572b430d99f213dd073613162f (diff)
fix ^C handling which was accidentally trapped a bit to much
ok rpe@ krw@
-rw-r--r--distrib/miniroot/dot.profile5
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/miniroot/dot.profile b/distrib/miniroot/dot.profile
index 34d40f98afe..dde4fa74392 100644
--- a/distrib/miniroot/dot.profile
+++ b/distrib/miniroot/dot.profile
@@ -1,4 +1,4 @@
-# $OpenBSD: dot.profile,v 1.18 2013/10/27 22:36:06 uwe Exp $
+# $OpenBSD: dot.profile,v 1.19 2013/11/14 15:20:54 halex Exp $
# $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $
#
# Copyright (c) 2009 Kenneth R. Westerback
@@ -73,7 +73,8 @@ __EOT
echo "Starting non-interactive installation in 5 seconds..."
>/tmp/noai
- trap 'kill $timeout_pid 2>/dev/null' INT EXIT
+ trap 'kill $timeout_pid 2>/dev/null' EXIT
+ trap 'exit 1' INT
trap 'timeout=true' TERM
# Stop monitoring background processes to avoid printing