Merge remote-tracking branch 'djgera/djgera'

Conflicts:
	rc.single
	rc.sysinit

Mostly trivial conflicts with Dave's path purging

Signed-off-by: Tom Gundersen <teg@jklm.no>

1 files changed, 5 insertions, 3 deletions

diff --git a/rc.multi b/rc.multi
index 60bb835..7af9279 100755
--- a/rc.multi
+++ b/rc.multi
@@ -26,8 +26,10 @@ fi
 
 run_hook multi_end
 
-/bin/touch /var/log/boot
-kill $(/bin/cat /run/bootlogd.pid)
-/bin/rm /run/bootlogd.pid
+if [[ -f /run/bootlogd.pid ]]; then
+	/bin/touch /var/log/boot
+	kill $(< /run/bootlogd.pid)
+	/bin/rm -f /run/bootlogd.pid
+fi
 
 # vim: set ts=2 sw=2 noet: