Date: Wed, 11 Sep 2013 17:42:35 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r255476 - in stable: 8/usr.sbin/mergemaster 9/usr.sbin/mergemaster Message-ID: <201309111742.r8BHgZax014505@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Wed Sep 11 17:42:35 2013 New Revision: 255476 URL: http://svnweb.freebsd.org/changeset/base/255476 Log: MFC r255428: Pass -n (do not emit comments) when saving mtree information for future mergemaster(8) runs. Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/9/usr.sbin/mergemaster/ (props changed) Changes in other areas also in this revision: Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/8/usr.sbin/mergemaster/ (props changed) Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/9/usr.sbin/mergemaster/mergemaster.sh Wed Sep 11 17:31:22 2013 (r255475) +++ stable/9/usr.sbin/mergemaster/mergemaster.sh Wed Sep 11 17:42:35 2013 (r255476) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309111742.r8BHgZax014505>