summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-02-11 09:16:17 +0000
committerngie <ngie@FreeBSD.org>2015-02-11 09:16:17 +0000
commit8d9631da62f92077e7552eb34c230b89e558d1e4 (patch)
tree8cb0e50d074d93604b62fab1faca987a7d5e7269
parenta85afe0d7d2b447ecd19af041628fb5963af8d4d (diff)
downloadFreeBSD-src-8d9631da62f92077e7552eb34c230b89e558d1e4.zip
FreeBSD-src-8d9631da62f92077e7552eb34c230b89e558d1e4.tar.gz
MFC r277736:
r277736: Honor MK_ACCT with etc/rc.d/accounting Sponsored by: EMC / Isilon Storage Division
-rw-r--r--etc/rc.d/Makefile4
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc1
2 files changed, 5 insertions, 0 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 5deead6..bec74e7 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -152,6 +152,10 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_ACCT} != "no"
+FILES+= accounting
+.endif
+
.if ${MK_ACPI} != "no"
FILES+= power_profile
.endif
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 0d9ef9a..b2cc2ae 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -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
OpenPOWER on IntegriCloud