Date: Thu, 20 May 2010 22:12:36 +0000 (UTC) From: Norikatsu Shigemura <nork@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r208365 - stable/8/usr.sbin/mergemaster Message-ID: <201005202212.o4KMCa74024268@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 '') ;; *)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005202212.o4KMCa74024268>