diff options
| author | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
| commit | ff87b5d1477fd150ff715e5c3c2a205deb66804f (patch) | |
| tree | a3620d99f472deaa7f019c4324bb8f4e38ac4272 /usr.sbin/mergemaster | |
| parent | 62bb1062226d3ce6a2350808256a25508978352d (diff) | |
| parent | 4d92de31b23f33109e1fa7f0b1499ed6c3501ee1 (diff) | |
| download | FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.zip FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.tar.gz | |
Merge head
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. |
