Author: delphij
Date: Wed Jun 8 06:33:55 2016
New Revision: 301584
URL: https://svnweb.freebsd.org/changeset/base/301584
Log:
Apply mergemaster r255428:
Pass -n (do not emit comments) when saving mtree information for future
mergemaster(8) runs.
MFC after: 3 days
Modified:
head/release/scripts/mm-mtree.sh
Modified: head/release/scripts/mm-mtree.sh
==============================================================================
--- head/release/scripts/mm-mtree.sh Wed Jun 8 05:34:22 2016
(r301583)
+++ head/release/scripts/mm-mtree.sh Wed Jun 8 06:33:55 2016
(r301584)
@@ -147,7 +147,7 @@ find -d ${TEMPROOT} -type d -empty -dele
# 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"
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
