Date: Mon, 9 Sep 2013 20:36:28 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255428 - head/usr.sbin/mergemaster Message-ID: <201309092036.r89KaSHH001996@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309092036.r89KaSHH001996>