Hello,

When running syspatch on a GENERIC.MP kernel with a single CPU core, syspatch
extracts usr/share/relink/kernel/GENERIC instead of
usr/share/relink/kernel/GENERIC.MP. reorder_kernel then relinks and installs
the unpatched GENERIC.MP kernel.

Possible fix copied inline at the end of this email.

Thanks a lot for all the work on this great OS!

Kris


Index: syspatch.sh
===================================================================
RCS file: /cvs/src/usr.sbin/syspatch/syspatch.sh,v
retrieving revision 1.167
diff -u -p -r1.167 syspatch.sh
--- syspatch.sh 7 Dec 2020 21:19:28 -0000       1.167
+++ syspatch.sh 10 Dec 2023 03:44:21 -0000
@@ -45,7 +45,7 @@ apply_patch()
        echo "Installing patch ${_patch##${_OSrev}-}"
        install -d ${_edir} ${_PDIR}/${_patch}

-       (($(sysctl -n hw.ncpufound) > 1)) &&
+       sysctl -n kern.osversion | grep -q '^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} \

Reply via email to