diff options
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/etcupdate/etcupdate.sh | 3 | ||||
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index addcc14e5366..a4728fa59b2e 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -213,7 +213,8 @@ build_tree() # Purge auto-generated files. Only the source files need to # be updated after which these files are regenerated. - rm -f $1/etc/*.db $1/etc/passwd >&3 2>&1 || return 1 + rm -f $1/etc/*.db $1/etc/passwd $1/var/db/services.db >&3 2>&1 || \ + return 1 # Remove empty files. These just clutter the output of 'diff'. find $1 -type f -size 0 -delete >&3 2>&1 || return 1 diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index f3aafaecfbc9..c5ed5fdfa26f 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -699,7 +699,8 @@ case "${RERUN}" in # or spwd.db. Instead, we want to compare the text versions, and run *_mkdb. # Prompt the user to do so below, as needed. # - rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd + rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd \ + ${TEMPROOT}/var/db/services.db # We only need to compare things like freebsd.cf once find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null |