From owner-svn-src-stable-8@FreeBSD.ORG  Thu May 20 22:12:36 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DB1D41065673;
	Thu, 20 May 2010 22:12:36 +0000 (UTC)
	(envelope-from nork@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C94658FC14;
	Thu, 20 May 2010 22:12:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4KMCaZs024270;
	Thu, 20 May 2010 22:12:36 GMT (envelope-from nork@svn.freebsd.org)
Received: (from nork@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4KMCa74024268;
	Thu, 20 May 2010 22:12:36 GMT (envelope-from nork@svn.freebsd.org)
Message-Id: <201005202212.o4KMCa74024268@svn.freebsd.org>
From: Norikatsu Shigemura <nork@FreeBSD.org>
Date: Thu, 20 May 2010 22:12:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208365 - stable/8/usr.sbin/mergemaster
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 May 2010 22:12:37 -0000

Author: nork
Date: Thu May 20 22:12:36 2010
New Revision: 208365
URL: http://svn.freebsd.org/changeset/base/208365

Log:
  MFC r207612:
    Add support run services_mkdb(8).
  
  Approved by:	dougb, imp (mentor)
  Reviewed by:	ume

Modified:
  stable/8/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/8/usr.sbin/mergemaster/   (props changed)

Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/8/usr.sbin/mergemaster/mergemaster.sh	Thu May 20 21:07:58 2010	(r208364)
+++ stable/8/usr.sbin/mergemaster/mergemaster.sh	Thu May 20 22:12:36 2010	(r208365)
@@ -851,6 +851,9 @@ mm_install () {
     /etc/login.conf)
       NEED_CAP_MKDB=yes
       ;;
+    /etc/services)
+      NEED_SERVICES_MKDB=yes
+      ;;
     /etc/master.passwd)
       do_install_and_rm 600 "${1}" "${DESTDIR}${INSTALL_DIR}"
       NEED_PWD_MKDB=yes
@@ -1280,6 +1283,17 @@ case "${NEED_CAP_MKDB}" in
   ;;
 esac
 
+case "${NEED_SERVICES_MKDB}" in
+'') ;;
+*)
+  echo ''
+  echo "*** You installed a services file, so make sure that you run"
+  echo "    '/usr/sbin/services_mkdb -q -o ${DESTDIR}/var/db/services.db ${DESTDIR}/etc/services'"
+  echo "     to rebuild your services database"
+  run_it_now "/usr/sbin/services_mkdb -q -o ${DESTDIR}/var/db/services.db ${DESTDIR}/etc/services"
+  ;;
+esac
+
 case "${NEED_PWD_MKDB}" in
 '') ;;
 *)