diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-07-15 19:58:05 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-07-15 19:58:05 +0000 |
| commit | 330a4821cb2c604f0ca5cc5d9150bcf0e2cb075e (patch) | |
| tree | deb64bec47c77fe2105d2b2fbd9a0af92b8d6b64 /usr.sbin/mergemaster | |
| parent | d86dfd0d4d3e84a64fa9d2ff10f2ac54d6ed21bc (diff) | |
| download | FreeBSD-src-330a4821cb2c604f0ca5cc5d9150bcf0e2cb075e.zip FreeBSD-src-330a4821cb2c604f0ca5cc5d9150bcf0e2cb075e.tar.gz | |
MFC r302674:
META_MODE: Don't require filemon(4) for mergemaster(8)/etcupdate(8)
Approved by: re (gjb)
Diffstat (limited to 'usr.sbin/mergemaster')
| -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 9bf4f9f..8561503 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -486,7 +486,7 @@ fi SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR -MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" +MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk -DNO_FILEMON" # Check DESTDIR against the mergemaster mtree database to see what # files the user changed from the reference files. |
