svn commit: r289927 - in user/ngie/detangle-rc: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Sun Oct 25 08:40:26 2015
New Revision: 289927
URL: https://svnweb.freebsd.org/changeset/base/289927

Log:
  Install etc/rc.d/{rtadvd,rtsold} if MK_INET6 != no and uninstall them if
  MK_INET6 == no

Modified:
  user/ngie/detangle-rc/etc/rc.d/Makefile
  user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc

Modified: user/ngie/detangle-rc/etc/rc.d/Makefile
==============================================================================
--- user/ngie/detangle-rc/etc/rc.d/Makefile	Sun Oct 25 08:30:44 2015	(r289926)
+++ user/ngie/detangle-rc/etc/rc.d/Makefile	Sun Oct 25 08:40:26 2015	(r289927)
@@ -100,8 +100,6 @@ FILES=	DAEMON \
 	root \
 	routing \
 	rpcbind \
-	rtadvd \
-	rtsold \
 	savecore \
 	sdpd \
 	securelevel \
@@ -191,6 +189,8 @@ FILES+=		hastd
 .if ${MK_INET6} != "no"
 FILES+=		mroute6d
 FILES+=		route6d
+FILES+=		rtadvd
+FILES+=		rtsold
 .endif
 
 .if ${MK_INETD} != "no"

Modified: user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc	Sun Oct 25 08:30:44 2015	(r289926)
+++ user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc	Sun Oct 25 08:40:26 2015	(r289927)
@@ -2786,6 +2786,8 @@ OLD_FILES+=usr/share/man/man3/iconvlist.
 .if ${MK_INET6} == no
 OLD_FILES+=etc/rc.d/mroute6d
 OLD_FILES+=etc/rc.d/route6d
+OLD_FILES+=etc/rc.d/rtadvd
+OLD_FILES+=etc/rc.d/rtsold
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol
 OLD_FILES+=usr/sbin/ip6addrctl