systemd: do not create /var/volatile/run and /var/volatile/lock

The directories are not needed anymore.

Previously:
/var/run  -> /var/volatile/run
/var/lock -> /var/volatile/lock

Now:
/var/run  -> /run
/var/lock -> /run/lock

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-core/systemd/systemd/00-create-volatile.conf b/meta/recipes-core/systemd/systemd/00-create-volatile.conf
index 6163a9cdce0e7e58c25a922de793bac0023b0cb0..9ffa88e464e54633e452bf3c9accd91a11925d16 100644 (file)
--- a/meta/recipes-core/systemd/systemd/00-create-volatile.conf
+++ b/meta/recipes-core/systemd/systemd/00-create-volatile.conf
@@ -4,6 +4,4 @@
 
 
 d              /var/volatile/log               -       -       -       -
-d              /var/volatile/lock              -       -       -       -
-d              /var/volatile/run               -       -       -       -
 d              /var/volatile/tmp               -       -       -       -

diff --git a/meta/recipes-core/systemd/systemd/init b/meta/recipes-core/systemd/systemd/init
index ac56ccaa72a5a80c743b0a1b966df42bba6f44e4..a42e732ea337b85d5e3821ed6643efd92319717b 100644 (file)
--- a/meta/recipes-core/systemd/systemd/init
+++ b/meta/recipes-core/systemd/systemd/init
@@ -42,7 +42,6 @@ case "$1" in
     [ -e /dev/pts ] || mkdir -m 0755 /dev/pts
     [ -e /dev/shm ] || mkdir -m 1777 /dev/shm
     mount -a -t tmpfs 2>/dev/null
-    mkdir -p /var/volatile/run
     if [ ! -e /run ]; then
         ln -s /var/run /run
     fi