4 files changed, 40 insertions, 6 deletions
diff --git a/units/var-lock.mount b/units/var-lock.mount
index 17c4f522ad..f14ea94d04 100644
--- a/units/var-lock.mount
+++ b/units/var-lock.mount
@@ -14,6 +14,3 @@ 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
new file mode 100644
index 0000000000..b148b5dff2
--- /dev/null
+++ b/units/var-lock.service
@@ -0,0 +1,20 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Lock Directory
+DefaultDependencies=no
+Requires=var-lock.mount
+Before=local-fs.target
+
+[Service]
+Type=oneshot
+ValidNoProcess=yes
+ExecStart=/bin/mkdir -p /var/lock/subsys
+
+[Install]
+WantedBy=local-fs.target
diff --git a/units/var-run.mount b/units/var-run.mount
index 90dfe0edaa..f786289536 100644
--- a/units/var-run.mount
+++ b/units/var-run.mount
@@ -14,6 +14,3 @@ 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
new file mode 100644
index 0000000000..10e2b0525f
--- /dev/null
+++ b/units/var-run.service
@@ -0,0 +1,20 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Runtime Directory
+DefaultDependencies=no
+Requires=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
+
+[Install]
+WantedBy=local-fs.target