diff options
| author | gjb <gjb@FreeBSD.org> | 2016-01-28 18:44:31 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-01-28 18:44:31 +0000 |
| commit | 319532475bf01fef9e40ccaf3c11dd457f7dd247 (patch) | |
| tree | be38a8e4df82887379e657f5f6324fe31e187913 | |
| parent | 5294f47313a2d45cb876c50ccb759a2073bc2ea2 (diff) | |
| download | FreeBSD-src-319532475bf01fef9e40ccaf3c11dd457f7dd247.zip FreeBSD-src-319532475bf01fef9e40ccaf3c11dd457f7dd247.tar.gz | |
Fix accounting package rc.d/accounting conflict.
Add periodic(8) accounting scripts to acct package.
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | etc/periodic/daily/Makefile | 8 | ||||
| -rw-r--r-- | etc/periodic/monthly/Makefile | 8 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 1 |
3 files changed, 14 insertions, 3 deletions
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile index de0f8f2..41e05ee 100644 --- a/etc/periodic/daily/Makefile +++ b/etc/periodic/daily/Makefile @@ -2,6 +2,8 @@ .include <src.opts.mk> +FILESGROUPS=FILES + FILES= 100.clean-disks \ 110.clean-tmps \ 120.clean-preserve \ @@ -23,8 +25,12 @@ FILES= 100.clean-disks \ # NB: keep these sorted by MK_* knobs .if ${MK_ACCT} != "no" -FILES+= 310.accounting +FILESGROUPS+= ACCT +ACCT+= 310.accounting .endif +ACCTDIR= /etc/periodic/daily +ACCTMODE= ${BINMODE} +ACCTPACKAGE= acct .if ${MK_CALENDAR} != "no" FILES+= 300.calendar diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile index ea2bd9f..6464219 100644 --- a/etc/periodic/monthly/Makefile +++ b/etc/periodic/monthly/Makefile @@ -2,13 +2,19 @@ .include <src.opts.mk> +FILESGROUPS=FILES + FILES= 450.status-security \ 999.local # NB: keep these sorted by MK_* knobs .if ${MK_UTMPX} != "no" -FILES+= 200.accounting +FILESGROUPS+= ACCT +ACCT+= 200.accounting .endif +ACCTDIR= /etc/periodic/monthly +ACCTMODE= ${BINMODE} +ACCTPACKAGE= acct .include <bsd.prog.mk> diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 1929718..0a57759 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -10,7 +10,6 @@ FILES= DAEMON \ NETWORKING \ SERVERS \ abi \ - accounting \ addswap \ adjkerntz \ archdep \ |
