SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2023-12-14 01:14:09 +00:00
parent 24ffeadca5
commit 8801582927
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
30 changed files with 1221 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

7
usr.sbin/syspatch/syspatch.sh
View file

@ -1,6 +1,6 @@
#!/bin/ksh
#
# $OpenBSD: syspatch.sh,v 1.167 2020/12/07 21:19:28 ajacoutot Exp $
# $OpenBSD: syspatch.sh,v 1.168 2023/12/13 17:50:23 ajacoutot Exp $
#
# Copyright (c) 2016, 2017 Antoine Jacoutot <ajacoutot@openbsd.org>
#
@ -34,7 +34,7 @@ usage()
apply_patch()
{
local _edir _file _files _patch=$1 _rc=0 _s _upself=false
local _edir _file _files _kernel _patch=$1 _rc=0 _s _upself=false
[[ -n ${_patch} ]]
_edir=${_TMP}/${_patch}
@ -45,7 +45,8 @@ apply_patch()
echo "Installing patch ${_patch##${_OSrev}-}"
install -d ${_edir} ${_PDIR}/${_patch}
(($(sysctl -n hw.ncpufound) > 1)) &&
_kernel=$(sysctl -n kern.osversion)
[[ ${_kernel%#*} == "GENERIC.MP" ]] &&
_s="-s @usr/share/relink/kernel/GENERIC/.*@@g" ||
_s="-s @usr/share/relink/kernel/GENERIC.MP/.*@@g"
_files="$(tar -xvzphf ${_TMP}/syspatch${_patch}.tgz -C ${_edir} \