svn commit: r207612 - head/usr.sbin/mergemaster
Norikatsu Shigemura
nork at FreeBSD.org
Tue May 4 11:25:05 UTC 2010
Author: nork
Date: Tue May 4 11:25:04 2010
New Revision: 207612
URL: http://svn.freebsd.org/changeset/base/207612
Log:
Add support run services_mkdb(8).
Approved by: dougb, imp (mentor)
Reviewed by: ume
MFC after: 2 weeks
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh Tue May 4 10:14:05 2010 (r207611)
+++ head/usr.sbin/mergemaster/mergemaster.sh Tue May 4 11:25:04 2010 (r207612)
@@ -849,6 +849,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
@@ -1278,6 +1281,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
'') ;;
*)
More information about the svn-src-head
mailing list