Patchwork [2/6] systemd: do not create /var/volatile/run and /var/volatile/lock

login
register
mail settings
Submitter Jonathan Liu
Date May 26, 2013, 11:13 a.m.
Message ID <1369566786-20341-3-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/50539/
State Accepted
Commit b314519f31699946140c93da961ff79e5ee28ccd
Headers show

Comments

Jonathan Liu - May 26, 2013, 11:13 a.m.
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>
---
 meta/recipes-core/systemd/systemd/00-create-volatile.conf | 2 --
 meta/recipes-core/systemd/systemd/init                    | 1 -
 2 files changed, 3 deletions(-)

Patch

diff --git a/meta/recipes-core/systemd/systemd/00-create-volatile.conf b/meta/recipes-core/systemd/systemd/00-create-volatile.conf
index 6163a9c..9ffa88e 100644
--- 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 ac56cca..a42e732 100644
--- 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