Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Oct 2015 06:07:47 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r289923 - user/ngie/detangle-rc/etc/rc.d
Message-ID:  <201510250607.t9P67lvs024102@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Sun Oct 25 06:07:46 2015
New Revision: 289923
URL: https://svnweb.freebsd.org/changeset/base/289923

Log:
  Conditionally install rc.d scripts based on MK_INET6, MK_ROUTED, and MK_ZFS

Modified:
  user/ngie/detangle-rc/etc/rc.d/Makefile

Modified: user/ngie/detangle-rc/etc/rc.d/Makefile
==============================================================================
--- user/ngie/detangle-rc/etc/rc.d/Makefile	Sun Oct 25 06:06:23 2015	(r289922)
+++ user/ngie/detangle-rc/etc/rc.d/Makefile	Sun Oct 25 06:07:46 2015	(r289923)
@@ -70,7 +70,6 @@ FILES=	DAEMON \
 	mdconfig \
 	mdconfig2 \
 	mountd \
-	mroute6d \
 	msgs \
 	natd \
 	netif \
@@ -99,7 +98,6 @@ FILES=	DAEMON \
 	resolv \
 	rfcomm_pppd_server \
 	root \
-	route6d \
 	routing \
 	rpcbind \
 	rtadvd \
@@ -131,8 +129,6 @@ FILES=	DAEMON \
 	ypset \
 	ypupdated \
 	ypxfrd \
-	zfs \
-	zvol
 
 .if ${MK_ACCT} != "no"
 FILES+=		accounting
@@ -192,6 +188,11 @@ FILES+=		ftpd
 FILES+=		hastd
 .endif
 
+.if ${MK_INET6} != "no"
+FILES+=		mroute6d
+FILES+=		route6d
+.endif
+
 .if ${MK_INETD} != "no"
 FILES+=		inetd
 .endif
@@ -284,6 +285,11 @@ FILES+=		hostapd
 FILES+=		wpa_supplicant
 .endif
 
+.if ${MK_ZFS} != "no"
+FILES+=		zfs
+FILES+=		zvol
+.endif
+
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510250607.t9P67lvs024102>