aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2014-01-22 16:59:53 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2014-01-22 16:59:53 +0000
commit385d6d47381b7b91803894b4509667558442bac5 (patch)
tree8ef7f4c487980321f126092e56db4386567ccc57 /usr.sbin
parentcddcca2dc37e950f59e247cc6bbbabb7da6b40c5 (diff)
downloadsrc-385d6d47381b7b91803894b4509667558442bac5.tar.gz
src-385d6d47381b7b91803894b4509667558442bac5.zip
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
Notes
Notes: svn path=/head/; revision=261031
Diffstat (limited to 'usr.sbin')
-rwxr-xr-xusr.sbin/etcupdate/etcupdate.sh3
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh3
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