d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When using the -D option:

Browse Source 
1. The new mtree file should be created in the "host" system /tmp
2. The existing mtree file in the "host" system should not be deleted

Submitted by:	scf
This commit is contained in:
dougb 2009-03-13 07:34:05 +00:00
parent 6270d8e9fe
commit b04b18c10b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/mergemaster/mergemaster.sh
View File

@ -671,7 +671,7 @@ find ${TEMPROOT} -type f -size 0 -delete 2>/dev/null
# Build the mtree database in a temporary location.
MTREENEW=`mktemp -t mergemaster.mtree`
case "${PRE_WORLD}" in
'') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${DESTDIR}${MTREENEW} 2>/dev/null
'') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
;;
*) # We don't want to mess with the mtree database on a pre-world run.
;;
@ -1037,10 +1037,10 @@ done # This is for the do way up there at the beginning of the comparison
echo ''
echo "*** Comparison complete"
if [ -f "${DESTDIR}${MTREENEW}" ]; then
if [ -f "${MTREENEW}" ]; then
echo "*** Saving mtree database for future upgrades"
test -e "${MTREEFILE}" && unlink ${MTREEFILE}
mv ${DESTDIR}${MTREENEW} ${DESTDIR}${MTREEFILE}
test -e "${DESTDIR}${MTREEFILE}" && unlink ${DESTDIR}${MTREEFILE}
mv ${MTREENEW} ${DESTDIR}${MTREEFILE}
fi
echo ''