d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionalize installing etc/rc.d/atm{1,2,3}

Browse Source 
`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
This commit is contained in:
Enji Cooper 2016-05-15 05:38:47 +00:00
parent fbee792a95
commit 904bea8330
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/rc.d/Makefile
View File

@ -14,9 +14,6 @@ FILES= DAEMON \
addswap \ addswap \
adjkerntz \ adjkerntz \
archdep \ archdep \
atm1 \
atm2 \
atm3 \
auditd \ auditd \
auditdistd \ auditdistd \
bgfsck \ bgfsck \
@ -157,6 +154,14 @@ APM+= apmd
APMPACKAGE= apm APMPACKAGE= apm
.endif .endif
.if ${MK_ATM} != "no"
FILESGROUPS+= ATM
ATM+= atm1
ATM+= atm2
ATM+= atm3
ATMPACKAGE= atm
.endif
.if ${MK_AUTOFS} != "no" .if ${MK_AUTOFS} != "no"
FILES+= automount FILES+= automount
FILES+= automountd FILES+= automountd

2
etc/rc.d/netif
View File

@ -26,7 +26,7 @@
# #
# PROVIDE: netif # PROVIDE: netif
# REQUIRE: atm1 FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl
# REQUIRE: ipfilter ipfs # REQUIRE: ipfilter ipfs
# KEYWORD: nojailvnet # KEYWORD: nojailvnet

3
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -76,6 +76,9 @@ OLD_FILES+=usr/share/man/man8/atrun.8.gz
.endif .endif
.if ${MK_ATM} == no .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+=rescue/atmconfig
OLD_FILES+=sbin/atmconfig OLD_FILES+=sbin/atmconfig
OLD_FILES+=usr/bin/sscop OLD_FILES+=usr/bin/sscop