diff options
| author | jhb <jhb@FreeBSD.org> | 2014-01-22 16:59:53 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2014-01-22 16:59:53 +0000 |
| commit | 08c2799ac32bcfa927afad09c3fd080204c2fca2 (patch) | |
| tree | 8ef7f4c487980321f126092e56db4386567ccc57 /usr.sbin/mergemaster | |
| parent | ada0e25d918f99abb6bf16ddd3802b8b28a5c935 (diff) | |
| download | FreeBSD-src-08c2799ac32bcfa927afad09c3fd080204c2fca2.zip FreeBSD-src-08c2799ac32bcfa927afad09c3fd080204c2fca2.tar.gz | |
Generate /var/db/services.db during 'make distribution' so that it is
present during new installs. Update etcupdate and mergemaster to
ignore the generated file.
Tested by: gjb (release build)
MFC after: 1 month
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 f3aafae..c5ed5fd 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 |
