diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2019-02-26 18:52:35 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2019-02-26 18:52:35 +0000 |
| commit | f5d8f4ec1c7e448391a4e4082975557408f8477a (patch) | |
| tree | 45fb9ca4c541223e58a94a82e6dc231bbb589cd4 /usr.sbin/syspatch | |
| parent | Fix sending IKEV2_CFG_INTERNAL_IP6_DNS, IKEV2_CFG_INTERNAL_IP6_NBNS, (diff) | |
| download | wireguard-openbsd-f5d8f4ec1c7e448391a4e4082975557408f8477a.tar.xz wireguard-openbsd-f5d8f4ec1c7e448391a4e4082975557408f8477a.zip | |
Move release check up front.
Diffstat (limited to 'usr.sbin/syspatch')
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index 1b508616e94..6f7656e4a7a 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.143 2019/02/20 08:50:00 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.144 2019/02/26 18:52:35 ajacoutot Exp $ # # Copyright (c) 2016, 2017 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -256,16 +256,16 @@ unpriv() eval su -s /bin/sh ${_user} -c "'$@'" } -[[ $@ == @(|-[[:alpha:]]) ]] || usage; [[ $@ == @(|-(c|R|r)) ]] && - (($(id -u) != 0)) && sp_err "${0##*/}: need root privileges" -[[ $@ == @(|-(R|r)) ]] && pgrep -qxf '/bin/ksh .*reorder_kernel' && - sp_err "${0##*/}: cannot apply patches while reorder_kernel is running" - # 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') ((${#_KERNV[*]} > 1)) && sp_err "Unsupported release: ${_KERNV[0]}${_KERNV[1]}" +[[ $@ == @(|-[[:alpha:]]) ]] || usage; [[ $@ == @(|-(c|R|r)) ]] && + (($(id -u) != 0)) && sp_err "${0##*/}: need root privileges" +[[ $@ == @(|-(R|r)) ]] && pgrep -qxf '/bin/ksh .*reorder_kernel' && + sp_err "${0##*/}: cannot apply patches while reorder_kernel is running" + _OSrev=${_KERNV[0]%.*}${_KERNV[0]#*.} [[ -n ${_OSrev} ]] |