[arch-projects] [PATCH 18/18] rc.sysinit: Fix and simplify /var/run/daemons workaround

Kurt J. Bosch kjb-temp-2009 at alpenjodel.de
Thu Jul 7 04:04:19 EDT 2011


Current behaviour:
a) /var/run is a symlink to /run: Conditional result is 'false' and thus the symlink won't be created at all.
b) /var/run is a directory: Conditional result is always 'true' because any symlink was removed when cleaning /var/run.

So just unconditionally remove /var/run/daemons and create a new symlink to /run/daemons.
This is possible without doing any harm since it shouldn't be in use at this point anyway.
---
 rc.sysinit |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/rc.sysinit b/rc.sysinit
index 7a12d1c..3c3039a 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -231,12 +231,10 @@ RANDOM_SEED=/var/lib/misc/random-seed
 		cp $RANDOM_SEED /dev/urandom
 
 stat_busy "Removing Leftover Files"
-	rm -rf /etc/{nologin,shutdownpid} /forcefsck /tmp/* /tmp/.* &>/dev/null
+	rm -rf /etc/{nologin,shutdownpid} /forcefsck /tmp/* /tmp/.* /var/run/daemons &>/dev/null
 	[[ ! -L /var/lock ]] && rm -rf /var/lock/*
 	[[ ! -L /var/run && -d /var/run ]] && find /var/run/ \! -type d -delete
-	[[ ! -L /var/run && ! -L /var/run/daemons ]] &&
-		rm -rf /var/run/daemons &&
-		ln -s /run/daemons /var/run/daemons
+	ln -s /run/daemons /var/run/daemons
 	install -Tm 0664 -o root -g utmp <(:) /var/run/utmp
 	# Keep {x,k,g}dm happy with xorg
 	mkdir -m 1777 /tmp/.{X11,ICE}-unix
-- 
1.7.1



More information about the arch-projects mailing list