Author: delphij
Date: Sat Jun 11 05:53:50 2016
New Revision: 301824
URL: https://svnweb.freebsd.org/changeset/base/301824
Log:
MFC r301584: Apply mergemaster r255428:
Pass -n (do not emit comments) when saving mtree information for future
mergemaster(8) runs.
Modified:
stable/10/release/scripts/mm-mtree.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/scripts/mm-mtree.sh
==============================================================================
--- stable/10/release/scripts/mm-mtree.sh Sat Jun 11 03:59:44 2016
(r301823)
+++ stable/10/release/scripts/mm-mtree.sh Sat Jun 11 05:53:50 2016
(r301824)
@@ -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"
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
