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

Only install the accounting/apm rc scripts for MK_ACCT/MK_APM if the relevant

Browse Source 
knobs are set
This commit is contained in:
Enji Cooper 2014-11-26 02:46:48 +00:00
parent bdf492a3ac
commit 4bbfcad580
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/rc.d/Makefile
View File

@ -8,12 +8,9 @@ FILES= DAEMON \
NETWORKING \
SERVERS \
abi \
accounting \
addswap \
adjkerntz \
amd \
apm \
apmd \
archdep \
atm1 \
atm2 \
@ -164,6 +161,15 @@ FILES= DAEMON \
zfs \
zvol
.if ${MK_ACCT} != "no"
FILES+= accounting
.endif
.if ${MK_APM} != "no"
FILES+= apm
FILES+= apmd
.endif
.if ${MK_BLUETOOTH} != "no"
_bluetooth= bluetooth
_bthidd= bthidd

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

@ -6,6 +6,7 @@
#
.if ${MK_ACCT} == no
OLD_FILES+=etc/rc.d/accounting
OLD_FILES+=etc/periodic/daily/310.accounting
OLD_FILES+=usr/sbin/accton
OLD_FILES+=usr/sbin/sa
@ -48,6 +49,8 @@ OLD_FILES+=usr/share/man/man8/wire-test.8.gz
.endif
.if ${MK_APM} == no
OLD_FILES+=etc/rc.d/apm
OLD_FILES+=etc/rc.d/apmd
OLD_FILES+=etc/apmd.conf
OLD_FILES+=usr/sbin/apm
OLD_FILES+=usr/share/examples/etc/apmd.conf