Author: delphij
Date: Mon Sep 9 20:36:28 2013
New Revision: 255428
URL: http://svnweb.freebsd.org/changeset/base/255428
Log:
Pass -n (do not emit comments) when saving mtree information for future
mergemaster(8) runs.
MFC after: 3 days
Approved by: re (kib)
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh Mon Sep 9 19:27:44 2013
(r255427)
+++ head/usr.sbin/mergemaster/mergemaster.sh Mon Sep 9 20:36:28 2013
(r255428)
@@ -707,7 +707,7 @@ case "${RERUN}" in
# Build the mtree database in a temporary location.
case "${PRE_WORLD}" in
'') 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
;;
*) # We don't want to mess with the mtree database on a pre-world run or
# when re-scanning a previously-built tree.
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
