summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2010-01-13 19:07:48 +0000
committered <ed@FreeBSD.org>2010-01-13 19:07:48 +0000
commit4f31d2c5a61c36bfed349f716ab4d35155f799f4 (patch)
treec8d3f8420976d87627b4e853630a0a5f239be784 /etc
parenta40e5b0c4872f0c1eb774b675e6e714e73d63d8c (diff)
downloadFreeBSD-src-4f31d2c5a61c36bfed349f716ab4d35155f799f4.zip
FreeBSD-src-4f31d2c5a61c36bfed349f716ab4d35155f799f4.tar.gz
Let rc and periodic infrastructure and newsyslog use the utmpx files.
Diffstat (limited to 'etc')
-rw-r--r--etc/newsyslog.conf2
-rwxr-xr-xetc/periodic/monthly/200.accounting2
-rwxr-xr-xetc/rc.d/cleanvar4
-rwxr-xr-xetc/rc.d/var14
4 files changed, 11 insertions, 11 deletions
diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf
index 354ed09..79ad037 100644
--- a/etc/newsyslog.conf
+++ b/etc/newsyslog.conf
@@ -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
diff --git a/etc/periodic/monthly/200.accounting b/etc/periodic/monthly/200.accounting
index 0be8c32..46f153d 100755
--- a/etc/periodic/monthly/200.accounting
+++ b/etc/periodic/monthly/200.accounting
@@ -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 ]
diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar
index 68e03bd..d4b5b14 100755
--- a/etc/rc.d/cleanvar
+++ b/etc/rc.d/cleanvar
@@ -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
diff --git a/etc/rc.d/var b/etc/rc.d/var
index 4b57fb5..8e5bdde 100755
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -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
OpenPOWER on IntegriCloud