diff options
author | Tom Gundersen <teg@jklm.no> | 2011-06-06 02:27:39 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2011-06-06 02:27:39 +0200 |
commit | 3ac781f2f188b4e9c698aba7ede6154a64ffc679 (patch) | |
tree | 73e6113f7d03beab9ea18672acf03859c10a4366 | |
parent | 36f31f686374ae3f2311f8674e0a91022d502576 (diff) | |
parent | 7a6fc752cf8dc09b9358810d947e6e01f9a8fc25 (diff) | |
download | initscripts-3ac781f2f188b4e9c698aba7ede6154a64ffc679.tar.xz |
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>
-rwxr-xr-x | rc.multi | 8 | ||||
-rwxr-xr-x | rc.single | 8 | ||||
-rwxr-xr-x | rc.sysinit | 11 |
3 files changed, 19 insertions, 8 deletions
@@ -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: @@ -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: @@ -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 |