diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2017-05-24 08:30:31 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2017-05-24 08:30:31 +0000 |
| commit | 9ca86c81da7f1c299ba582660ebcfd8cc02ea8c5 (patch) | |
| tree | e994a669d1c017e76500babf028475ecffb361f2 /usr.sbin/syspatch/syspatch.sh | |
| parent | Set REQ_EXT in req section so ikectl ca certificate revoke will work again. (diff) | |
| download | wireguard-openbsd-9ca86c81da7f1c299ba582660ebcfd8cc02ea8c5.tar.xz wireguard-openbsd-9ca86c81da7f1c299ba582660ebcfd8cc02ea8c5.zip | |
Also trap INT when reverting a patch.
Diffstat (limited to 'usr.sbin/syspatch/syspatch.sh')
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index b355d5369db..33785e74bb4 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.106 2017/05/23 13:08:28 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.107 2017/05/24 08:30:31 ajacoutot Exp $ # # Copyright (c) 2016, 2017 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -214,6 +214,7 @@ rollback_patch() _edir=${_TMP}/${_patch}-rollback _patch=${_OSrev}-${_patch} + trap '' INT echo "Reverting patch ${_patch##${_OSrev}-}" install -d ${_edir} @@ -235,6 +236,7 @@ rollback_patch() ((_ret == 0)) && rm -r ${_PDIR}/${_patch} || sp_err "Failed to revert patch ${_patch##${_OSrev}-}" ${_ret} + trap exit INT } sp_cleanup() |