aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2016-06-08 06:33:55 +0000
committerXin LI <delphij@FreeBSD.org>2016-06-08 06:33:55 +0000
commita29af14de4fe369bf1e4d53dfe521c0d768be417 (patch)
tree2c2a0397225a3e68938b3b587ea8c436e0c779b8 /release/scripts
parent6523ab7e004a5befe7673b2e9469f12c4c3a3b77 (diff)
downloadsrc-a29af14de4fe369bf1e4d53dfe521c0d768be417.tar.gz
src-a29af14de4fe369bf1e4d53dfe521c0d768be417.zip
Apply mergemaster r255428:
Pass -n (do not emit comments) when saving mtree information for future mergemaster(8) runs. MFC after: 3 days
Notes
Notes: svn path=/head/; revision=301584
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/mm-mtree.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/mm-mtree.sh b/release/scripts/mm-mtree.sh
index 4499c1076343..620ab6dd962c 100755
--- a/release/scripts/mm-mtree.sh
+++ b/release/scripts/mm-mtree.sh
@@ -147,7 +147,7 @@ find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null
# Build the mtree database in a temporary location.
MTREENEW=`mktemp -t mergemaster.mtree`
-mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
+mtree -nci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
if [ -s "${MTREENEW}" ]; then
echo "*** Saving mtree database for future upgrades"