Date: Sat, 5 Mar 2011 02:11:23 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r219283 - in stable/8/etc: periodic/daily rc.d Message-ID: <201103050211.p252BNFv089712@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sat Mar 5 02:11:23 2011 New Revision: 219283 URL: http://svn.freebsd.org/changeset/base/219283 Log: MFC r218961: Update how accounting log files are rotated, clean up the rc.d script a bit. MFC r218986: The new accounting file needs to be 644 so that unprivileged users can use lastcomm(1) Modified: stable/8/etc/periodic/daily/310.accounting stable/8/etc/rc.d/accounting Directory Properties: stable/8/etc/ (props changed) Modified: stable/8/etc/periodic/daily/310.accounting ============================================================================== --- stable/8/etc/periodic/daily/310.accounting Sat Mar 5 00:59:34 2011 (r219282) +++ stable/8/etc/periodic/daily/310.accounting Sat Mar 5 02:11:23 2011 (r219283) @@ -41,13 +41,16 @@ case "$daily_accounting_enable" in m=$n n=$(($n - 1)) done - cp -pf acct acct.0 || rc=3 - sa -s $daily_accounting_flags || rc=3 + + /etc/rc.d/accounting rotate_log || rc=3 case "$daily_accounting_compress" in [Yy][Ee][Ss]) - gzip -f acct.0 || rc=3;; + gzip --keep -f acct.0 || rc=3;; esac + + sa -s $daily_accounting_flags /var/account/acct.0 && + unlink acct.0 || rc=3 fi;; *) rc=0;; Modified: stable/8/etc/rc.d/accounting ============================================================================== --- stable/8/etc/rc.d/accounting Sat Mar 5 00:59:34 2011 (r219282) +++ stable/8/etc/rc.d/accounting Sat Mar 5 02:11:23 2011 (r219283) @@ -14,28 +14,31 @@ name="accounting" rcvar=`set_rcvar` accounting_command="/usr/sbin/accton" accounting_file="/var/account/acct" + +extra_commands="rotate_log" + start_cmd="accounting_start" stop_cmd="accounting_stop" +rotate_log_cmd="accounting_rotate_log" accounting_start() { local _dir - _dir=`dirname "$accounting_file"` - if [ ! -d `dirname "$_dir"` ]; then + _dir="${accounting_file%/*}" + if [ ! -d "$_dir" ]; then if ! mkdir -p "$_dir"; then - warn "Could not create $_dir." - return 1 + err 1 "Could not create $_dir." fi fi + if [ ! -e "$accounting_file" ]; then + echo -n "Creating accounting file ${accounting_file}" touch "$accounting_file" + echo '.' fi + chmod 644 "$accounting_file" - if [ ! -f ${accounting_file} ]; then - echo "Creating accounting file ${accounting_file}" - ( umask 022 ; > ${accounting_file} ) - fi echo "Turning on accounting." ${accounting_command} ${accounting_file} } @@ -46,5 +49,27 @@ accounting_stop() ${accounting_command} } +accounting_rotate_log() +{ + local _dir _file + + _dir="${accounting_file%/*}" + cd $_dir + + if checkyesno accounting_enable; then + _file=`mktemp newacct-XXXXX` + chmod 644 $_file + ${accounting_command} ${_dir}/${_file} + fi + + mv ${accounting_file} ${accounting_file}.0 + + if checkyesno accounting_enable; then + ln $_file ${accounting_file##*/} + ${accounting_command} ${accounting_file} + unlink $_file + fi +} + load_rc_config $name run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103050211.p252BNFv089712>