diff options
| author | delphij <delphij@FreeBSD.org> | 2013-09-09 20:36:28 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-09-09 20:36:28 +0000 |
| commit | 504259487c661af075cec8eecf4c7b1362182f0f (patch) | |
| tree | d151d6f40fe1830f02363eed20202203fd417912 /usr.sbin/mergemaster | |
| parent | 04bb6e10cd2cbd0ee0de7fef3f81e88ebd43e6b4 (diff) | |
| download | FreeBSD-src-504259487c661af075cec8eecf4c7b1362182f0f.zip FreeBSD-src-504259487c661af075cec8eecf4c7b1362182f0f.tar.gz | |
Pass -n (do not emit comments) when saving mtree information for future
mergemaster(8) runs.
MFC after: 3 days
Approved by: re (kib)
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 629d44f..361cef9 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -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. |
