diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-03-25 05:07:20 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-28 23:00:00 +0200 |
| commit | 2b583ce6576d4a074ce6f1570b3e60b65c64ae7d (patch) | |
| tree | c5cfa0138219cc79a6412bb69abe13ece385009c /src/mount.c | |
| parent | 37f85e66e8f396b6f758e063531b95531aef628e (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 'src/mount.c')
| -rw-r--r-- | src/mount.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mount.c b/src/mount.c index 99867172c9..cc49b1993f 100644 --- a/src/mount.c +++ b/src/mount.c @@ -844,6 +844,10 @@ static void mount_enter_mounting(Mount *m) { mkdir_p(m->where, m->directory_mode); + /* create the source directory for bind-mounts if needed */ + if (m->parameters_fragment.fstype && strcmp(m->parameters_fragment.fstype, "bind") == 0) + mkdir_p(m->parameters_fragment.what, m->directory_mode); + if (m->from_fragment) r = exec_command_set( m->control_command, |