/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 <teg@jklm.no>

1 files changed, 9 insertions, 6 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() {