From 9339db7187c61eb7ae7e6ffcddb2b2f2686954eb Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 11 Jun 2014 00:12:21 +0200
Subject: tmpfiles: always recreate the most basic directory structure in /var

Let's allow booting up with /var empty. Only create the most basic
directories to get to a working directory structure and symlink set in
/var.
---
 tmpfiles.d/legacy.conf  |  1 +
 tmpfiles.d/systemd.conf |  5 -----
 tmpfiles.d/var.conf     | 20 ++++++++++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 tmpfiles.d/var.conf

(limited to 'tmpfiles.d')

diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf
index a1656873da..32196723f9 100644
--- a/tmpfiles.d/legacy.conf
+++ b/tmpfiles.d/legacy.conf
@@ -11,6 +11,7 @@
 # systems.
 
 d /run/lock 0755 root root -
+L /var/lock - - - - ../run/lock
 
 # /run/lock/subsys is used for serializing SysV service execution, and
 # hence without use on SysV-less systems.
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
index 85dc35699d..9554f38d36 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -10,11 +10,6 @@
 d /run/user 0755 root root ~10d
 F! /run/utmp 0664 root utmp -
 
-f /var/log/wtmp 0664 root utmp -
-f /var/log/btmp 0600 root utmp -
-
-d /var/cache/man - - - 30d
-
 d /run/systemd/ask-password 0755 root root -
 d /run/systemd/seats 0755 root root -
 d /run/systemd/sessions 0755 root root -
diff --git a/tmpfiles.d/var.conf b/tmpfiles.d/var.conf
new file mode 100644
index 0000000000..10d2e4965d
--- /dev/null
+++ b/tmpfiles.d/var.conf
@@ -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 Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# See tmpfiles.d(5) for details
+
+L /var/run - - - - ../run
+
+d /var/log 0755 - - -
+f /var/log/wtmp 0664 root utmp -
+f /var/log/btmp 0600 root utmp -
+
+d /var/cache 0755 - - -
+d /var/cache/man - - - 30d
+
+d /var/lib 0755 - - -
+d /var/spool 0755 - - -
-- 
cgit v1.2.3-54-g00ecf