diff options
author | Xin LI <delphij@FreeBSD.org> | 2013-09-09 20:36:28 +0000 |
---|---|---|
committer | Xin LI <delphij@FreeBSD.org> | 2013-09-09 20:36:28 +0000 |
commit | b10eed4081d56dcbd1583e9919e6c1192b4664ec (patch) | |
tree | d151d6f40fe1830f02363eed20202203fd417912 /usr.sbin/mergemaster | |
parent | edb572a38c433b49f2a06fe12bed3f8156e88cfa (diff) | |
download | src-test2-b10eed4081d56dcbd1583e9919e6c1192b4664ec.tar.gz src-test2-b10eed4081d56dcbd1583e9919e6c1192b4664ec.zip |
Notes
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 629d44fbd8ea..361cef9146fa 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. |