Date: Wed, 13 Jan 2010 19:07:49 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r202218 - in head/etc: . periodic/monthly rc.d Message-ID: <201001131907.o0DJ7nfb096239@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Wed Jan 13 19:07:48 2010 New Revision: 202218 URL: http://svn.freebsd.org/changeset/base/202218 Log: Let rc and periodic infrastructure and newsyslog use the utmpx files. Modified: head/etc/newsyslog.conf head/etc/periodic/monthly/200.accounting head/etc/rc.d/cleanvar head/etc/rc.d/var Modified: head/etc/newsyslog.conf ============================================================================== --- head/etc/newsyslog.conf Wed Jan 13 19:03:48 2010 (r202217) +++ head/etc/newsyslog.conf Wed Jan 13 19:07:48 2010 (r202218) @@ -33,6 +33,6 @@ /var/log/ppp.log root:network 640 3 100 * JC /var/log/security 600 10 100 * JC /var/log/sendmail.st 640 10 * 168 B +/var/log/utx.log 644 3 * @01T05 B /var/log/weekly.log 640 5 1 $W6D0 JN -/var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * JC Modified: head/etc/periodic/monthly/200.accounting ============================================================================== --- head/etc/periodic/monthly/200.accounting Wed Jan 13 19:03:48 2010 (r202217) +++ head/etc/periodic/monthly/200.accounting Wed Jan 13 19:07:48 2010 (r202218) @@ -15,7 +15,7 @@ oldmask=$(umask) umask 066 case "$monthly_accounting_enable" in [Yy][Ee][Ss]) - W=/var/log/wtmp + W=/var/log/utx.log rc=0 remove=NO if [ ! -f $W.0 ] Modified: head/etc/rc.d/cleanvar ============================================================================== --- head/etc/rc.d/cleanvar Wed Jan 13 19:03:48 2010 (r202217) +++ head/etc/rc.d/cleanvar Wed Jan 13 19:07:48 2010 (r202218) @@ -58,8 +58,8 @@ cleanvar_start () { if [ -d /var/run -a ! -f /var/run/clean_var ]; then purgedir /var/run - # And an initial utmp file - (cd /var/run && cp /dev/null utmp && chmod 644 utmp) + # And an initial utmpx active session file + (cd /var/run && cp /dev/null utx.active && chmod 644 utx.active) >/var/run/clean_var fi if [ -d /var/spool/lock -a ! -f /var/spool/lock/clean_var ]; then Modified: head/etc/rc.d/var ============================================================================== --- head/etc/rc.d/var Wed Jan 13 19:03:48 2010 (r202217) +++ head/etc/rc.d/var Wed Jan 13 19:07:48 2010 (r202218) @@ -98,12 +98,12 @@ case "${populate_var}" in ;; esac -# Make sure we have /var/log/lastlog and /var/log/wtmp files -if [ ! -f /var/log/lastlog ]; then - cp /dev/null /var/log/lastlog - chmod 644 /var/log/lastlog +# Make sure we have /var/log/utx.lastlogin and /var/log/utx.log files +if [ ! -f /var/log/utx.lastlogin ]; then + cp /dev/null /var/log/utx.lastlogin + chmod 644 /var/log/utx.lastlogin fi -if [ ! -f /var/log/wtmp ]; then - cp /dev/null /var/log/wtmp - chmod 644 /var/log/wtmp +if [ ! -f /var/log/utx.log ]; then + cp /dev/null /var/log/utx.log + chmod 644 /var/log/utx.log fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001131907.o0DJ7nfb096239>