From 88a671ee26112e779a455bdd266a7071e1db5a1f Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 8 Dec 2011 21:08:32 +0100 Subject: /run: move /var/{run,lock} to /run/{,lock} All packages in core/extra now supports this, and keeping them separated might soon cause problems (in particular, I submitted a patch to rpcbind that would cause problems if the symlinks are not in place). Signed-off-by: Tom Gundersen --- functions | 15 +++++++++------ tmpfiles.conf | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/functions b/functions index 8bad79b..213dc81 100644 --- a/functions +++ b/functions @@ -506,13 +506,16 @@ umount_all() { remove_leftover() { stat_busy "Removing Leftover Files" - # handle this separately until we declare the non-symlinks obsoleted - [[ ! -L /var/lock ]] && rm -rf /var/lock/* - if [[ ! -L /var/run && -d /var/run ]]; then - find /var/run/ \! -type d -delete - ln -s /run/daemons /var/run/daemons - fi /usr/lib/initscripts/arch-tmpfiles --create --remove && stat_done || stat_fail + # move from static /var/{run,lock} to /run + if [[ ! -L /var/lock ]]; then + rm -rf /var/lock + ln -s /run/lock /var/lock + fi + if [[ ! -L /var/run ]]; then + rm -rf /var/run + ln -s /run /var/run + fi } bootlogd_stop() { diff --git a/tmpfiles.conf b/tmpfiles.conf index 7dd1358..90deb9d 100644 --- a/tmpfiles.conf +++ b/tmpfiles.conf @@ -11,7 +11,7 @@ d /tmp/.XIM-unix 1777 root root d /tmp/.font-unix 1777 root root d /tmp/.Test-unix 1777 root root -F /var/run/utmp 0664 root utmp +F /run/utmp 0664 root utmp r /tmp/.X[0-9]-lock r /etc/nologin -- cgit v1.2.3