[projects/rc-scripts] Drop support for utmpx/wtmpx
baggins
baggins at pld-linux.org
Mon Nov 11 12:03:39 CET 2013
commit 2afd725af7ff7ea3e496c1ee9ba7e92dba4719a4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Nov 11 12:00:52 2013 +0100
Drop support for utmpx/wtmpx
There was never any difference between regular and "extended" utmp/wtmp
file on linux. Some programs (like last from util-linux 2.24, or systemd)
have no knowledge about them, and keeping those files supported in PLD
is useless pain.
rc.d/init.d/sys-chroots | 21 +++++++++++----------
rc.d/rc.sysinit | 21 +++++++++++----------
sysconfig/system | 3 ---
3 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/rc.d/init.d/sys-chroots b/rc.d/init.d/sys-chroots
index 19ba42f..6737300 100755
--- a/rc.d/init.d/sys-chroots
+++ b/rc.d/init.d/sys-chroots
@@ -77,17 +77,18 @@ start() {
/tmp/scrollkeeper-* /tmp/ssh-*
# Clean up utmp/wtmp
- if ! is_no "$NEED_XFILES" ; then
- > /var/run/utmpx
- touch /var/log/wtmpx
- chown root:utmp /var/run/utmpx /var/log/wtmpx
- chmod 0664 /var/run/utmpx /var/log/wtmpx
- else
- > /var/run/utmp
- touch /var/log/wtmp
- chown root:utmp /var/run/utmp /var/log/wtmp
- chmod 0664 /var/run/utmp /var/log/wtmp
+ rm -f /var/run/utmpx
+ > /var/run/utmp
+ if [ -e /var/log/wtmpx ]; then
+ if [ -e /var/log/wtmp ]; then
+ rm -f /var/log/wtmpx
+ else
+ mv /var/log/wtmpx /var/log/wtmp
+ fi
fi
+ touch /var/log/wtmp
+ chown root:utmp /var/run/utmp /var/log/wtmp
+ chmod 0664 /var/run/utmp /var/log/wtmp
# Clean /tmp
if is_yes "$CLEAN_TMP"; then
rm -rf /tmp/* /tmp/.[a-zA-Z0-9]*
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 82d153f..1b81dce 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -970,17 +970,18 @@ rm -rf /tmp/.X*-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/hsperfdata_* \
{
# Clean up utmp/wtmp
-if ! is_no "$NEED_XFILES"; then
- > /var/run/utmpx
- touch /var/log/wtmpx
- chown root:utmp /var/run/utmpx /var/log/wtmpx
- chmod 0664 /var/run/utmpx /var/log/wtmpx
-else
- > /var/run/utmp
- touch /var/log/wtmp
- chown root:utmp /var/run/utmp /var/log/wtmp
- chmod 0664 /var/run/utmp /var/log/wtmp
+rm -f /var/run/utmpx
+> /var/run/utmp
+if [ -e /var/log/wtmpx ]; then
+ if [ -e /var/log/wtmp ]; then
+ rm -f /var/log/wtmpx
+ else
+ mv /var/log/wtmpx /var/log/wtmp
+ fi
fi
+touch /var/log/wtmp
+chown root:utmp /var/run/utmp /var/log/wtmp
+chmod 0664 /var/run/utmp /var/log/wtmp
# Clean /tmp
if is_yes "$CLEAN_TMP" && ! is_fsmounted tmpfs /tmp; then
diff --git a/sysconfig/system b/sysconfig/system
index 31b5e4f..f86eb73 100644
--- a/sysconfig/system
+++ b/sysconfig/system
@@ -49,9 +49,6 @@ DELAY_LOGIN=yes
# Clean /tmp at startup ?
CLEAN_TMP=yes
-# We want utmpx/wtmpx
-NEED_XFILES=yes
-
# Try to setup proper symlinks in /boot (based on kernel version) ?
SET_SLINKS=yes
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/rc-scripts.git/commitdiff/2afd725af7ff7ea3e496c1ee9ba7e92dba4719a4
More information about the pld-cvs-commit
mailing list