Skip to content

Commit

Permalink
Use full path to sysctl(8) since /sbin is not in PATH.
Browse files Browse the repository at this point in the history
X-MFC-With:	r355379
MFC after:	2 weeks
  • Loading branch information
bdrewery committed Dec 4, 2019
1 parent 5f8a7e6 commit eb5db90
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion usr.sbin/mergemaster/mergemaster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit eb5db90

Please sign in to comment.