Index: projects/release-pkg/etc/periodic/daily/Makefile =================================================================== --- projects/release-pkg/etc/periodic/daily/Makefile (revision 295003) +++ projects/release-pkg/etc/periodic/daily/Makefile (revision 295004) @@ -1,58 +1,64 @@ # $FreeBSD$ .include +FILESGROUPS=FILES + FILES= 100.clean-disks \ 110.clean-tmps \ 120.clean-preserve \ 200.backup-passwd \ 210.backup-aliases \ 330.news \ 400.status-disks \ 401.status-graid \ 406.status-gmirror \ 407.status-graid3 \ 408.status-gstripe \ 409.status-gconcat \ 420.status-network \ 430.status-uptime \ 450.status-security \ 510.status-world-kernel \ 999.local # 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 .endif .if ${MK_MAIL} != "no" FILES+= 130.clean-msgs .endif .if ${MK_NTP} != "no" FILES+= 480.status-ntpd \ 480.leapfile-ntpd .endif .if ${MK_RCMDS} != "no" FILES+= 140.clean-rwho .endif .if ${MK_SENDMAIL} != "no" FILES+= 150.clean-hoststat \ 440.status-mailq \ 460.status-mail-rejects \ 500.queuerun .endif .if ${MK_ZFS} != "no" FILES+= 404.status-zfs \ 800.scrub-zfs .endif .include Index: projects/release-pkg/etc/periodic/monthly/Makefile =================================================================== --- projects/release-pkg/etc/periodic/monthly/Makefile (revision 295003) +++ projects/release-pkg/etc/periodic/monthly/Makefile (revision 295004) @@ -1,14 +1,20 @@ # $FreeBSD$ .include +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 Index: projects/release-pkg/etc/rc.d/Makefile =================================================================== --- projects/release-pkg/etc/rc.d/Makefile (revision 295003) +++ projects/release-pkg/etc/rc.d/Makefile (revision 295004) @@ -1,330 +1,329 @@ # $FreeBSD$ .include FILESGROUPS= FILES FILES= DAEMON \ FILESYSTEMS \ LOGIN \ NETWORKING \ SERVERS \ abi \ - accounting \ addswap \ adjkerntz \ archdep \ atm1 \ atm2 \ atm3 \ auditd \ auditdistd \ bgfsck \ ${_bluetooth} \ bridge \ ${_bthidd} \ ${_casperd} \ cleanvar \ cleartmp \ cron \ ctld \ ddb \ defaultroute \ devd \ devfs \ dhclient \ dmesg \ dumpon \ fsck \ gbde \ geli \ geli2 \ gptboot \ growfs \ gssd \ ${_hcsecd} \ hostid \ hostid_save \ hostname \ iovctl \ ip6addrctl \ ipfilter \ ipfs \ ipfw \ ipmon \ ipnat \ ipsec \ ${_kadmind} \ ${_kdc} \ ${_kfd} \ kld \ kldxref \ ${_kpasswdd} \ ldconfig \ local \ localpkg \ lockd \ mixer \ motd \ mountcritlocal \ mountcritremote \ mountlate \ mdconfig \ mdconfig2 \ mountd \ mroute6d \ msgs \ natd \ netif \ netoptions \ netwait \ newsyslog \ nfsclient \ nfscbd \ nfsd \ nfsuserd \ nisdomain \ ${_nscd} \ nsswitch \ ntpdate \ ${_opensm} \ pf \ pflog \ pfsync \ ppp \ pppoed \ pwcheck \ quota \ random \ rarpd \ rctl \ resolv \ rfcomm_pppd_server \ root \ route6d \ routing \ rpcbind \ rtadvd \ rtsold \ savecore \ sdpd \ securelevel \ serial \ sppp \ statd \ static_arp \ static_ndp \ stf \ swap \ swaplate \ sysctl \ syslogd \ tmp \ ${_ubthidhci} \ ugidfw \ ${_utx} \ var \ watchdogd \ ypbind \ yppasswdd \ ypserv \ ypset \ ypupdated \ ypxfrd \ zfs \ zvol .if ${MK_ACCT} != "no" FILESGROUPS+= ACCT ACCT+= accounting .endif .if ${MK_ACPI} != "no" FILESGROUPS+= ACPI ACPI= power_profile .endif .if ${MK_ACPI} != "no" || ${MK_APM} != "no" FILES+= powerd .endif .if ${MK_AMD} != "no" FILESGROUPS+= AMD AMD+= amd .endif .if ${MK_APM} != "no" FILESGROUPS+= APM APM+= apm APM+= apmd .endif .if ${MK_AUTOFS} != "no" FILES+= automount FILES+= automountd FILES+= autounmountd .endif .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth _bthidd= bthidd _hcsecd= hcsecd _ubthidhci= ubthidhci .endif .if ${MK_BOOTPARAMD} != "no" FILES+= bootparams .endif .if ${MK_BSNMP} != "no" FILESGROUPS+= BSNMP BSNMP+= bsnmpd .endif .if ${MK_CASPER} != "no" _casperd= casperd .endif .if ${MK_CCD} != "no" FILES+= ccd .endif .if ${MK_FTP} != "no" FILES+= ftpd .endif .if ${MK_HAST} != "no" FILES+= hastd .endif .if ${MK_INETD} != "no" FILES+= inetd .endif .if ${MK_ISCSI} != "no" FILES+= iscsictl FILES+= iscsid .endif .if ${MK_JAIL} != "no" FILESGROUPS+= JAIL JAIL+= jail .endif .if ${MK_LEGACY_CONSOLE} != "no" FILES+= moused FILES+= syscons .endif .if ${MK_LPR} != "no" FILES+= lpd .endif .if ${MK_KERBEROS} != "no" FILES+= ipropd_master FILES+= ipropd_slave _kadmind= kadmind _kdc= kdc _kfd= kfd _kpasswdd= kpasswdd .endif .if ${MK_MAIL} != "no" FILES+= othermta .endif .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif .if ${MK_NTP} != "no" FILES+= ntpd .endif .if ${MK_OFED} != "no" _opensm= opensm .endif .if ${MK_OPENSSL} != "no" FILES+= keyserv .endif .if ${MK_OPENSSH} != "no" FILESGROUPS+= SSH SSH= sshd .endif .if ${MK_PF} != "no" FILES+= ftp-proxy .endif .if ${MK_RCMDS} != "no" FILES+= rwho .endif .if ${MK_ROUTED} != "no" FILES+= routed .endif .if ${MK_SENDMAIL} != "no" FILES+= sendmail .endif .if ${MK_TIMED} != "no" FILES+= timed .endif .if ${MK_UNBOUND} != "no" FILESGROUPS+= UNBOUND UNBOUND+= local_unbound .endif .if ${MK_UTMPX} != "no" _utx= utx .endif .if ${MK_VI} != "no" FILES+= virecover .endif .if ${MK_WIRELESS} != "no" FILES+= hostapd FILES+= wpa_supplicant .endif FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} UNBOUNDDIR= /etc/rc.d UNBOUNDMODE= ${BINMODE} UNBOUNDPACKAGE= unbound ACPIDIR= /etc/rc.d ACPIMODE= ${BINMODE} ACPIPACKAGE= acpi AMDDIR= /etc/rc.d AMDMODE= ${BINMODE} AMDPACKAGE= amd SSHDIR= /etc/rc.d SSHMODE= ${BINMODE} SSHPACKAGE= ssh BSNMPDIR= /etc/rc.d BSNMPMODE= ${BINMODE} BSNMPPACKAGE= bsnmp JAILDIR= /etc/rc.d JAILMODE= ${BINMODE} JAILPACKAGE= jail ACCTDIR= /etc/rc.d ACCTMODE= ${BINMODE} ACCTPACKAGE= acct APMDIR= /etc/rc.d APMMODE= ${BINMODE} APMPACKAGE= apm .include