diff options
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 7816a6b..960e83e 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -528,6 +528,9 @@ esac # rm -f ${TEMPROOT}/etc/spwd.db ${TEMPROOT}/etc/passwd ${TEMPROOT}/etc/pwd.db +# We only need to compare things like freebsd.cf once +find ${TEMPROOT}/usr/obj -type f -delete + # Get ready to start comparing files # Check umask if not specified on the command line, |
