openbsd
/
src
mirror of https://github.com/openbsd/src.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match what reorder_kernel is doing and use kern.osversion to find out whether 

we are running an MP kernel or not.

based on a reworked submission from kris at devtty dot one via deraadt@
input and ok robert@
This commit is contained in:
ajacoutot 2023-12-13 17:50:23 +00:00
parent 144aff15d1
commit f608ccdaec
1 changed files with 4 additions and 3 deletions
Show Stats 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} \