From 08c2799ac32bcfa927afad09c3fd080204c2fca2 Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Wed, 22 Jan 2014 16:59:53 +0000
Subject: 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
---
 usr.sbin/mergemaster/mergemaster.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr.sbin/mergemaster')

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
-- 
cgit v1.1