summaryrefslogtreecommitdiffstats
path: root/usr.sbin/bsdconfig
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2016-02-03 03:55:08 +0000
committerdteske <dteske@FreeBSD.org>2016-02-03 03:55:08 +0000
commitb2bf30d1a948ddce18a8a4178be88dde5ec18c69 (patch)
tree3f5eb7443abf41bc29662d80aac6a6132b8e1753 /usr.sbin/bsdconfig
parent65c2ff7ea86f0742ea35f9bca64c13656af2f529 (diff)
downloadFreeBSD-src-b2bf30d1a948ddce18a8a4178be88dde5ec18c69.zip
FreeBSD-src-b2bf30d1a948ddce18a8a4178be88dde5ec18c69.tar.gz
Remove SIG prefix from trapped signals
Makes traps functional if running under shells/dash
Diffstat (limited to 'usr.sbin/bsdconfig')
-rw-r--r--usr.sbin/bsdconfig/share/common.subr9
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/bsdconfig/share/common.subr b/usr.sbin/bsdconfig/share/common.subr
index 5996446..2b911fc 100644
--- a/usr.sbin/bsdconfig/share/common.subr
+++ b/usr.sbin/bsdconfig/share/common.subr
@@ -1,7 +1,7 @@
if [ ! "$_COMMON_SUBR" ]; then _COMMON_SUBR=1
#
# Copyright (c) 2012 Ron McDowell
-# Copyright (c) 2012-2015 Devin Teske
+# Copyright (c) 2012-2016 Devin Teske
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -1015,10 +1015,9 @@ f_count_ifs()
#
# Trap signals so we can recover gracefully
#
-trap 'f_interrupt' SIGINT
-trap 'f_die' SIGTERM SIGPIPE SIGXCPU SIGXFSZ \
- SIGFPE SIGTRAP SIGABRT SIGSEGV
-trap '' SIGALRM SIGPROF SIGUSR1 SIGUSR2 SIGHUP SIGVTALRM
+trap 'f_interrupt' INT
+trap 'f_die' TERM PIPE XCPU XFSZ FPE TRAP ABRT SEGV
+trap '' ALRM PROF USR1 USR2 HUP VTALRM
#
# Clone terminal stdout/stderr so we can redirect to it from within sub-shells
OpenPOWER on IntegriCloud