diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2015-10-13 18:52:56 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2015-10-13 18:52:56 +0000 |
| commit | e6d77aaa61faf56e2ccd836ceec5b3ff06d9c6b5 (patch) | |
| tree | bd435b791ff752564eed8cb2eaac76547d359422 /usr.sbin/sysmerge | |
| parent | Allow ioctl SIOCGNBRINFO_IN6 in case of "route", for use by ndp. (diff) | |
| download | wireguard-openbsd-e6d77aaa61faf56e2ccd836ceec5b3ff06d9c6b5.tar.xz wireguard-openbsd-e6d77aaa61faf56e2ccd836ceec5b3ff06d9c6b5.zip | |
sm_error() already does the exit for us.
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 8f6fdd16f2b..6e9bedd8b67 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.213 2015/10/12 18:25:16 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.214 2015/10/13 18:52:56 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -47,7 +47,7 @@ sm_trap() { sm_error } -trap "sm_trap; exit 1" 1 2 3 13 15 +trap "sm_trap" 1 2 3 13 15 sm_info() { (($#)) && echo "---- Info: $@" || true |