diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2014-01-22 16:59:53 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2014-01-22 16:59:53 +0000 |
| commit | 385d6d47381b7b91803894b4509667558442bac5 (patch) | |
| tree | 8ef7f4c487980321f126092e56db4386567ccc57 /usr.sbin/mergemaster | |
| parent | cddcca2dc37e950f59e247cc6bbbabb7da6b40c5 (diff) | |
| download | src-test2-385d6d47381b7b91803894b4509667558442bac5.tar.gz src-test2-385d6d47381b7b91803894b4509667558442bac5.zip | |
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |