svn commit: r299842 - in head: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Sun May 15 05:38:47 2016
New Revision: 299842
URL: https://svnweb.freebsd.org/changeset/base/299842

Log:
  Conditionalize installing etc/rc.d/atm{1,2,3}
  
  `BEFORE: netif` was already in etc/rc.d/atm1, so no additional changes
  are needed in that script
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile
  head/etc/rc.d/netif
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Sun May 15 05:22:15 2016	(r299841)
+++ head/etc/rc.d/Makefile	Sun May 15 05:38:47 2016	(r299842)
@@ -14,9 +14,6 @@ FILES=	DAEMON \
 	addswap \
 	adjkerntz \
 	archdep \
-	atm1 \
-	atm2 \
-	atm3 \
 	auditd \
 	auditdistd \
 	bgfsck \
@@ -157,6 +154,14 @@ APM+=		apmd
 APMPACKAGE=	apm
 .endif
 
+.if ${MK_ATM} != "no"
+FILESGROUPS+=	ATM
+ATM+=		atm1
+ATM+=		atm2
+ATM+=		atm3
+ATMPACKAGE=	atm
+.endif
+
 .if ${MK_AUTOFS} != "no"
 FILES+=		automount
 FILES+=		automountd

Modified: head/etc/rc.d/netif
==============================================================================
--- head/etc/rc.d/netif	Sun May 15 05:22:15 2016	(r299841)
+++ head/etc/rc.d/netif	Sun May 15 05:38:47 2016	(r299842)
@@ -26,7 +26,7 @@
 #
 
 # PROVIDE: netif
-# REQUIRE: atm1 FILESYSTEMS iovctl serial sppp sysctl
+# REQUIRE: FILESYSTEMS iovctl serial sppp sysctl
 # REQUIRE: ipfilter ipfs
 # KEYWORD: nojailvnet
 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sun May 15 05:22:15 2016	(r299841)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sun May 15 05:38:47 2016	(r299842)
@@ -76,6 +76,9 @@ OLD_FILES+=usr/share/man/man8/atrun.8.gz
 .endif
 
 .if ${MK_ATM} == no
+OLD_FILES+=etc/rc.d/atm1
+OLD_FILES+=etc/rc.d/atm2
+OLD_FILES+=etc/rc.d/atm3
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/bin/sscop