diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-12-04 04:01:53 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-12-04 04:01:53 +0000 |
| commit | efdd39d20d0294d9699b7bf888eed4b41f167040 (patch) | |
| tree | 24ae1610760ff604ea2cc76f54f95eb3d761c8c7 | |
| parent | ad73d2ab3f63e58ee70f85fc6d157a1764a479d4 (diff) | |
| download | src-efdd39d20d0294d9699b7bf888eed4b41f167040.tar.gz src-efdd39d20d0294d9699b7bf888eed4b41f167040.zip | |
Use full path to sysctl(8) since /sbin is not in PATH.
X-MFC-With: r355379
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=355381
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 2b9fcadcb151..415b5e454590 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -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. |