310.accounting: Verify process accounting is active before log rotation.
This corrects a bug in which the daily periodic script '310.accounting' attempts to rotate logs via /etc/rc.d/accounting by calling onerotate_logs function. The rotate logs function turns accounting back on regardless of what acccounting_enable is set to in /etc/rc.conf. This is due to checkyesno always returning YES since rotate logs is called with the 'one' prefix. In effect, accounting will always be turned back on once a day even if it is disabled and stopped by hand. The fix was simple, just check if accounting is before rotating logs and if it is, don't attempt the rotate. PR: 267464 Reviewed by: imp, hps (lgtm, not approval), Mina Galić Pull Request: https://github.com/freebsd/freebsd-src/pull/648 Differential Revision: https://reviews.freebsd.org/D37434
This commit is contained in:
parent
5f7bea2952
commit
9ab40bc40d
@ -18,6 +18,11 @@ case "$daily_accounting_enable" in
|
|||||||
echo '$daily_accounting_enable is set but /var/account/acct' \
|
echo '$daily_accounting_enable is set but /var/account/acct' \
|
||||||
"doesn't exist"
|
"doesn't exist"
|
||||||
rc=2
|
rc=2
|
||||||
|
elif [ $(sysctl -n kern.acct_configured) -eq 0 ]
|
||||||
|
then
|
||||||
|
echo '$daily_accounting_enable is set but' \
|
||||||
|
'process accounting is not active'
|
||||||
|
rc=2
|
||||||
elif [ -z "$daily_accounting_save" ]
|
elif [ -z "$daily_accounting_save" ]
|
||||||
then
|
then
|
||||||
echo '$daily_accounting_enable is set but ' \
|
echo '$daily_accounting_enable is set but ' \
|
||||||
|
Loading…
Reference in New Issue
Block a user