From b15117d7524c6ca6ecb2de74967f4503a63a372c Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Thu, 20 May 2010 22:12:36 +0000 Subject: [PATCH] MFC r207612: Add support run services_mkdb(8). Approved by: dougb, imp (mentor) Reviewed by: ume --- usr.sbin/mergemaster/mergemaster.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 311f226924b2..19381b7cf530 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -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 '') ;; *)