summaryrefslogtreecommitdiff
path: root/units/var-lock.mount
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-03-25 05:07:20 +0100
committerLennart Poettering <lennart@poettering.net>2011-03-28 23:00:00 +0200
commit2b583ce6576d4a074ce6f1570b3e60b65c64ae7d (patch)
treec5cfa0138219cc79a6412bb69abe13ece385009c /units/var-lock.mount
parent37f85e66e8f396b6f758e063531b95531aef628e (diff)
use /run instead of /dev/.run
Instead of the /dev/.run trick we have currently implemented, we decided to move the early-boot runtime dir to /run. An existing /var/run directory is bind-mounted to /run. If /var/run is already a symlink, no action is taken. An existing /var/lock directory is bind-mounted to /run/lock. If /var/lock is already a symlink, no action is taken. To implement the directory vs. symlink logic, we have a: ConditionPathIsDirectory= now, which is used in the mount units. Skipped mount unit in case of symlink: $ systemctl status var-run.mount var-run.mount - Runtime Directory Loaded: loaded (/lib/systemd/system/var-run.mount) Active: inactive (dead) start condition failed at Fri, 25 Mar 2011 04:51:41 +0100; 6min ago Where: /var/run What: /run CGroup: name=systemd:/system/var-run.mount The systemd rpm needs to make sure to add something like: %pre mkdir -p -m0755 /run >/dev/null 2>&1 || : or it needs to be added to filesystem.rpm. Udev -git already uses /run if that exists, and is writable at bootup. Otherwise it falls back to the current /dev/.udev. Dracut and plymouth need to be adopted to switch from /dev/.run to run too. Cheers, Kay
Diffstat (limited to 'units/var-lock.mount')
-rw-r--r--units/var-lock.mount8
1 files changed, 5 insertions, 3 deletions
diff --git a/units/var-lock.mount b/units/var-lock.mount
index 0ea2599b71..80e1bab261 100644
--- a/units/var-lock.mount
+++ b/units/var-lock.mount
@@ -8,9 +8,11 @@
[Unit]
Description=Lock Directory
Before=local-fs.target
+# skip mounting if the directory does not exist or is a symlink
+ConditionPathIsDirectory=/var/lock
[Mount]
-What=tmpfs
+What=/run/lock
Where=/var/lock
-Type=tmpfs
-Options=mode=775,gid=lock,nosuid,nodev,noexec
+Type=bind
+Options=bind