units: add missing After= for var-run.service, var-lock.service

4 files changed, 9 insertions, 1 deletions

diff --git a/units/var-lock.mount b/units/var-lock.mount
index f14ea94d04..17c4f522ad 100644
--- a/units/var-lock.mount
+++ b/units/var-lock.mount
@@ -14,3 +14,6 @@ What=tmpfs
 Where=/var/lock
 Type=tmpfs
 Options=mode=775,gid=lock
+
+[Install]
+WantedBy=local-fs.target
diff --git a/units/var-lock.service b/units/var-lock.service
index b148b5dff2..d382958aea 100644
--- a/units/var-lock.service
+++ b/units/var-lock.service
@@ -9,6 +9,7 @@
 Description=Lock Directory
 DefaultDependencies=no
 Requires=var-lock.mount
+After=var-run.mount
 Before=local-fs.target
 
 [Service]
diff --git a/units/var-run.mount b/units/var-run.mount
index f786289536..90dfe0edaa 100644
--- a/units/var-run.mount
+++ b/units/var-run.mount
@@ -14,3 +14,6 @@ What=tmpfs
 Where=/var/run
 Type=tmpfs
 Options=mode=755
+
+[Install]
+WantedBy=local-fs.target
diff --git a/units/var-run.service b/units/var-run.service
index 10e2b0525f..a958ff7d11 100644
--- a/units/var-run.service
+++ b/units/var-run.service
@@ -9,12 +9,13 @@
 Description=Runtime Directory
 DefaultDependencies=no
 Requires=var-run.mount
+After=var-run.mount
 Before=local-fs.target
 
 [Service]
 Type=oneshot
 ValidNoProcess=yes
-ExecStart=/bin/touch /var/run/utmp ; /bin/chown root:utmp /var/run/utmp
+ExecStart=/bin/touch /var/run/utmp ; /bin/chmod 0664 /var/run/utmp ; /bin/chown root:utmp /var/run/utmp
 
 [Install]
 WantedBy=local-fs.target