From 2b583ce6576d4a074ce6f1570b3e60b65c64ae7d Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 25 Mar 2011 05:07:20 +0100
Subject: 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
---
 man/sd_readahead.xml   | 2 +-
 man/systemd-nspawn.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'man')

diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml
index f5114e49a7..004608dfba 100644
--- a/man/sd_readahead.xml
+++ b/man/sd_readahead.xml
@@ -123,7 +123,7 @@
                 reference implementation.</para>
 
                 <para>Internally, this function creates a file in
-                <filename>/dev/.run/systemd/readahead/</filename> which is
+                <filename>/run/systemd/readahead/</filename> which is
                 then used as flag file to notify the read-ahead
                 subsystem.</para>
 
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 70ebf94e0f..667e75c2cd 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -99,7 +99,7 @@
                 <para>Note that <command>systemd-nspawn</command> will
                 mount file systems private to the container to
                 <filename>/dev</filename>,
-                <filename>/dev/.run</filename> and similar. These will
+                <filename>/run</filename> and similar. These will
                 not be visible outside of the container, and their
                 contents will be lost when the container exits.</para>
 
-- 
cgit v1.2.3-54-g00ecf