Date: Sat, 11 Jun 2016 05:58:51 +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: r301825 - stable/9/release/scripts Message-ID: <201606110558.u5B5wpCb085268@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Sat Jun 11 05:58:51 2016 New Revision: 301825 URL: https://svnweb.freebsd.org/changeset/base/301825 Log: MFC r301584: Apply mergemaster r255428: Pass -n (do not emit comments) when saving mtree information for future mergemaster(8) runs. Modified: stable/9/release/scripts/mm-mtree.sh Directory Properties: stable/9/release/ (props changed) Modified: stable/9/release/scripts/mm-mtree.sh ============================================================================== --- stable/9/release/scripts/mm-mtree.sh Sat Jun 11 05:53:50 2016 (r301824) +++ stable/9/release/scripts/mm-mtree.sh Sat Jun 11 05:58:51 2016 (r301825) @@ -142,7 +142,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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606110558.u5B5wpCb085268>