diff options
| -rw-r--r-- | functions | 15 | ||||
| -rwxr-xr-x | rc.sysinit | 6 | ||||
| -rw-r--r-- | tmpfiles.conf | 2 |
3 files changed, 13 insertions, 10 deletions
@@ -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() { @@ -14,9 +14,9 @@ printsep # 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 sys /sys -o nosuid,noexec,nodev -mountpoint -q /run || mount -n -t tmpfs run /run -o mode=0755,size=10M,nosuid,nodev -mountpoint -q /dev || mount -n -t devtmpfs udev /dev -o mode=0755,size=10M,nosuid || - mount -n -t tmpfs udev /dev -o mode=0755,size=10M,nosuid +mountpoint -q /run || mount -n -t tmpfs run /run -o mode=0755,nosuid,nodev +mountpoint -q /dev || mount -n -t devtmpfs udev /dev -o mode=0755,nosuid || + mount -n -t tmpfs udev /dev -o mode=0755,nosuid mkdir -p -m 1777 /run/lock mkdir -p /dev/{pts,shm} mountpoint -q /dev/pts || mount -n /dev/pts &>/dev/null || diff --git a/tmpfiles.conf b/tmpfiles.conf index 7dd1358..90deb9d 100644 --- a/tmpfiles.conf +++ b/tmpfiles.conf @@ -11,7 +11,7 @@ d /tmp/.XIM-unix 1777 root root d /tmp/.font-unix 1777 root root d /tmp/.Test-unix 1777 root root -F /var/run/utmp 0664 root utmp +F /run/utmp 0664 root utmp r /tmp/.X[0-9]-lock r /etc/nologin |