From owner-svn-src-projects@freebsd.org Thu Jan 28 18:44:32 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF59DA70872 for ; Thu, 28 Jan 2016 18:44:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 88D4F102B; Thu, 28 Jan 2016 18:44:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0SIiVAw073704; Thu, 28 Jan 2016 18:44:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0SIiV4x073701; Thu, 28 Jan 2016 18:44:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601281844.u0SIiV4x073701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 28 Jan 2016 18:44:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295004 - in projects/release-pkg/etc: periodic/daily periodic/monthly rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2016 18:44:32 -0000 Author: gjb Date: Thu Jan 28 18:44:31 2016 New Revision: 295004 URL: https://svnweb.freebsd.org/changeset/base/295004 Log: Fix accounting package rc.d/accounting conflict. Add periodic(8) accounting scripts to acct package. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/etc/periodic/daily/Makefile projects/release-pkg/etc/periodic/monthly/Makefile projects/release-pkg/etc/rc.d/Makefile Modified: projects/release-pkg/etc/periodic/daily/Makefile ============================================================================== --- projects/release-pkg/etc/periodic/daily/Makefile Thu Jan 28 18:44:11 2016 (r295003) +++ projects/release-pkg/etc/periodic/daily/Makefile Thu Jan 28 18:44:31 2016 (r295004) @@ -2,6 +2,8 @@ .include +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 Modified: projects/release-pkg/etc/periodic/monthly/Makefile ============================================================================== --- projects/release-pkg/etc/periodic/monthly/Makefile Thu Jan 28 18:44:11 2016 (r295003) +++ projects/release-pkg/etc/periodic/monthly/Makefile Thu Jan 28 18:44:31 2016 (r295004) @@ -2,13 +2,19 @@ .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 Modified: projects/release-pkg/etc/rc.d/Makefile ============================================================================== --- projects/release-pkg/etc/rc.d/Makefile Thu Jan 28 18:44:11 2016 (r295003) +++ projects/release-pkg/etc/rc.d/Makefile Thu Jan 28 18:44:31 2016 (r295004) @@ -10,7 +10,6 @@ FILES= DAEMON \ NETWORKING \ SERVERS \ abi \ - accounting \ addswap \ adjkerntz \ archdep \