diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2017-01-19 23:04:48 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2017-01-19 23:04:48 +0000 |
| commit | fe3e31ddd95e1e4103baed183a7be73d46e170da (patch) | |
| tree | aa40f118d9b93e166191c029442856a77f32c328 /usr.sbin/syspatch/syspatch.sh | |
| parent | Fix -L/-I processing in -0 mode so that NUL-delimited entries are (diff) | |
| download | wireguard-openbsd-fe3e31ddd95e1e4103baed183a7be73d46e170da.tar.xz wireguard-openbsd-fe3e31ddd95e1e4103baed183a7be73d46e170da.zip | |
/etc/mirror.conf -> /etc/installurl
discussed with deraadt@ beck@ rpe@
Diffstat (limited to 'usr.sbin/syspatch/syspatch.sh')
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index 5cb7ef3323e..6a49c9acfb3 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.84 2017/01/19 09:08:45 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.85 2017/01/19 23:04:48 ajacoutot Exp $ # # Copyright (c) 2016 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -181,7 +181,7 @@ ls_missing() local _c _l="$(ls_installed)" _sha=${_TMP}/SHA256 # don't output anything on stdout to prevent corrupting the patch list - unpriv -f "${_sha}.sig" ftp -MVo "${_sha}.sig" "${_MIRROR}/SHA256.sig" | + unpriv -f "${_sha}.sig" ftp -MVo "${_sha}.sig" "${_MIRROR}/SHA256.sig" \ >/dev/null unpriv -f "${_sha}" signify -Veq -x ${_sha}.sig -m ${_sha} -p \ /etc/signify/openbsd-${_OSrev}-syspatch.pub >/dev/null @@ -282,8 +282,8 @@ set -A _KERNV -- $(sysctl -n kern.version | (($(id -u) != 0)) && sp_err "${0##*/}: need root privileges" (($(sysctl -n hw.ncpufound) > 1)) && _BSDMP=true || _BSDMP=false -_MIRROR=$(stripcom /etc/mirror.conf) || - sp_err "${0##*/}: no mirror configured in /etc/mirror.conf" +_MIRROR=$(stripcom /etc/installurl) || + sp_err "${0##*/}: no mirror configured in /etc/installurl" _MIRROR=${_MIRROR}/syspatch/${_KERNV[0]}/$(machine)/ _OSrev=${_KERNV[0]%\.*}${_KERNV[0]#*\.} _PDIR="/var/syspatch" |