Date: Wed, 4 Dec 2019 04:01:53 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355381 - head/usr.sbin/mergemaster Message-ID: <201912040401.xB441rn2092534@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Dec 4 04:01:53 2019 New Revision: 355381 URL: https://svnweb.freebsd.org/changeset/base/355381 Log: Use full path to sysctl(8) since /sbin is not in PATH. X-MFC-With: r355379 MFC after: 2 weeks Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.sh Wed Dec 4 03:51:30 2019 (r355380) +++ head/usr.sbin/mergemaster/mergemaster.sh Wed Dec 4 04:01:53 2019 (r355381) @@ -508,7 +508,7 @@ SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk -DNO_FILEMON" -MM_MAKE="${MM_MAKE} -j$(sysctl -n hw.ncpu)" +MM_MAKE="${MM_MAKE} -j$(/sbin/sysctl -n hw.ncpu)" # Check DESTDIR against the mergemaster mtree database to see what # files the user changed from the reference files.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912040401.xB441rn2092534>