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>

3 files changed, 19 insertions, 8 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:
diff --git a/rc.single b/rc.single
index c754eb1..91d346b 100755
--- a/rc.single
+++ b/rc.single
@@ -50,9 +50,11 @@ if [[ $RUNLEVEL = 1 ]]; then
 	exec init -t1 S
 fi
 
-touch /var/log/boot
-kill $(< /run/bootlogd.pid)
-rm /run/bootlogd.pid
+if [[ -f /run/bootlogd.pid ]]; then
+	touch /var/log/boot
+	kill $(< /run/bootlogd.pid)
+	rm -f /run/bootlogd.pid
+fi
 
 # End of file
 # vim: set ts=2 sw=2 noet:
diff --git a/rc.sysinit b/rc.sysinit
index 3531a88..c43dd95 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -18,8 +18,8 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 # mount /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm (the api filesystems)
 mountpoint -q /proc    || mount -n -t proc proc /proc -o nosuid,noexec,nodev
-mountpoint -q /sys     || mount -n -t sysfs sysfs /sys -o nosuid,noexec,nodev
-mountpoint -q /run     || mount -n -t tmpfs tmpfs /run -o mode=755,size=10M,nosuid,nodev
+mountpoint -q /sys     || mount -n -t sysfs sys /sys -o nosuid,noexec,nodev
+mountpoint -q /run     || mount -n -t tmpfs run /run -o mode=755,size=10M,nosuid,nodev
 if ! mountpoint -q /dev; then
 	if grep -q devtmpfs /proc/filesystems &>/dev/null; then
 		mount -n -t devtmpfs udev /dev -o mode=0755,size=10M,nosuid
@@ -354,6 +354,13 @@ fi
 # Set console font if required
 set_consolefont
 
+if [[ -e /proc/sys/kernel/dmesg_restrict && $(< /proc/sys/kernel/dmesg_restrict) -eq 1 ]]; then
+    : >| /var/log/dmesg.log
+    chmod 600 /var/log/dmesg.log
+else
+    : >| /var/log/dmesg.log
+    chmod 644 /var/log/dmesg.log
+fi
 dmesg >| /var/log/dmesg.log
 
 run_hook sysinit_end