diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2002-04-08 10:30:44 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2002-04-08 10:30:44 +0000 |
| commit | 3e9d29b012f5d70367cabcbf603a360caf920fcb (patch) | |
| tree | 5afcfda23008561d25a9cbc24ddd025f4d7423fd | |
| parent | 64503575e312b5b1c9f05cbf6df3fbf7b64d5fd6 (diff) | |
Notes
| -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 7816a6b71961..960e83eef182 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, |