diff options
| author | delphij <delphij@FreeBSD.org> | 2016-06-08 06:33:55 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-06-08 06:33:55 +0000 |
| commit | d0a4ede7beb35df23c9b53b00d02d8bad7ae5d6f (patch) | |
| tree | 2c2a0397225a3e68938b3b587ea8c436e0c779b8 | |
| parent | 1f0b9095a5874fad8aec0bbf0eeaff727a63e72b (diff) | |
| download | FreeBSD-src-d0a4ede7beb35df23c9b53b00d02d8bad7ae5d6f.zip FreeBSD-src-d0a4ede7beb35df23c9b53b00d02d8bad7ae5d6f.tar.gz | |
Apply mergemaster r255428:
Pass -n (do not emit comments) when saving mtree information for future
mergemaster(8) runs.
MFC after: 3 days
| -rwxr-xr-x | release/scripts/mm-mtree.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/mm-mtree.sh b/release/scripts/mm-mtree.sh index 4499c10..620ab6d 100755 --- a/release/scripts/mm-mtree.sh +++ b/release/scripts/mm-mtree.sh @@ -147,7 +147,7 @@ find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null # 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" |
