From 904bea83306699e522a3acbd38077cf2c93f9596 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sun, 15 May 2016 05:38:47 +0000 Subject: 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 --- etc/rc.d/Makefile | 11 ++++++++--- etc/rc.d/netif | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'etc/rc.d') diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 65102a10971e..89d2baf8732e 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/etc/rc.d/netif b/etc/rc.d/netif index 6174585f4858..e2b182559013 100755 --- a/etc/rc.d/netif +++ b/etc/rc.d/netif @@ -26,7 +26,7 @@ # # PROVIDE: netif -# REQUIRE: atm1 FILESYSTEMS iovctl serial sppp sysctl +# REQUIRE: FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: ipfilter ipfs # KEYWORD: nojailvnet -- cgit v1.2.3