From owner-svn-src-user@FreeBSD.ORG Fri Jan 8 07:42:02 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22897106566C; Fri, 8 Jan 2010 07:42:02 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ED1328FC08; Fri, 8 Jan 2010 07:42:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o087g1hl006368; Fri, 8 Jan 2010 07:42:01 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o087g1HD006364; Fri, 8 Jan 2010 07:42:01 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201001080742.o087g1HD006364@svn.freebsd.org> From: Ed Schouten Date: Fri, 8 Jan 2010 07:42:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201772 - in user/ed/utmpx/etc: . periodic/monthly rc.d X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2010 07:42:02 -0000 Author: ed Date: Fri Jan 8 07:42:01 2010 New Revision: 201772 URL: http://svn.freebsd.org/changeset/base/201772 Log: Let /etc use the proper utmpx files. Modified: user/ed/utmpx/etc/newsyslog.conf user/ed/utmpx/etc/periodic/monthly/200.accounting user/ed/utmpx/etc/rc.d/var Modified: user/ed/utmpx/etc/newsyslog.conf ============================================================================== --- user/ed/utmpx/etc/newsyslog.conf Fri Jan 8 07:29:51 2010 (r201771) +++ user/ed/utmpx/etc/newsyslog.conf Fri Jan 8 07:42:01 2010 (r201772) @@ -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: user/ed/utmpx/etc/periodic/monthly/200.accounting ============================================================================== --- user/ed/utmpx/etc/periodic/monthly/200.accounting Fri Jan 8 07:29:51 2010 (r201771) +++ user/ed/utmpx/etc/periodic/monthly/200.accounting Fri Jan 8 07:42:01 2010 (r201772) @@ -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: user/ed/utmpx/etc/rc.d/var ============================================================================== --- user/ed/utmpx/etc/rc.d/var Fri Jan 8 07:29:51 2010 (r201771) +++ user/ed/utmpx/etc/rc.d/var Fri Jan 8 07:42:01 2010 (r201772) @@ -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