diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2016-11-01 10:25:43 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2016-11-01 10:25:43 +0000 |
| commit | 4aef221cd4a1e1b0ae0a4f040e5f11358eca14d7 (patch) | |
| tree | 6d8bc8cd75043bda86cdd1c88f73c365c319f712 /usr.sbin/syspatch/syspatch.sh | |
| parent | Clear window alert flags after setting winlink alert flags, fixes problem (diff) | |
| download | wireguard-openbsd-4aef221cd4a1e1b0ae0a4f040e5f11358eca14d7.tar.xz wireguard-openbsd-4aef221cd4a1e1b0ae0a4f040e5f11358eca14d7.zip | |
We don't want to run on -stable (i.e. locally built release) but only on
official release.
Remove the half cooked rollback patch if we run into an error.
Diffstat (limited to 'usr.sbin/syspatch/syspatch.sh')
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index fa1905e4ae7..71f811bbaf6 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.15 2016/09/11 13:10:59 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.16 2016/11/01 10:25:43 ajacoutot Exp $ # # Copyright (c) 2016 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -67,7 +67,7 @@ create_rollback() _rbfiles="${_rbfiles} ${_file}" done - (cd / && + if ! (cd / && # GENERIC.MP: substitute bsd.mp->bsd and bsd.sp->bsd if ${_BSDMP} && tar -tzf ${_TMP}/${_patch}.tgz bsd >/dev/null 2>&1; then @@ -78,7 +78,9 @@ create_rollback() tar -czf ${_PDIR}/${_REL}/rollback-${_patch}.tgz \ ${_rbfiles} fi - ) + ); then + rm ${_PDIR}/${_REL}/rollback-${_patch}.tgz; return 1 + fi } fetch_and_verify() @@ -213,10 +215,10 @@ rollback_patch() ${_PDIR}/${_REL}/${_patch#syspatch-${_RELINT}-}.patch.sig } -# we do not run on current +# only run on release (not -current nor -stable) set -A _KERNV -- $(sysctl -n kern.version | sed 's/^OpenBSD \([0-9]\.[0-9]\)\([^ ]*\).*/\1 \2/;q') -[[ -z ${_KERNV[1]} ]] || [[ ${_KERNV[1]} == "-stable" ]] +[[ -z ${_KERNV[1]} ]] # check args [[ $@ == @(|-[[:alpha:]]) ]] || usage |