summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-21 17:28:16 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-21 17:43:55 +0200
commitfed2b07ebc9e8694b5b326923356028f464381ce (patch)
treed6903603f4cd54334e829bacb3f029afc1b2dde3
parent451d691ae110a600497348d9f6288bc84efb8642 (diff)
downloadsystemd-fed2b07ebc9e8694b5b326923356028f464381ce.tar.gz
tmpfiles: make /home and /var btrfs subvolumes by default when booted up with them missing
This way the root subvolume can be left read-only easily, and variable and user data writable with explicit quota set.
-rw-r--r--Makefile.am3
-rw-r--r--tmpfiles.d/home.conf11
-rw-r--r--tmpfiles.d/var.conf2
3 files changed, 14 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 68d8252b84..8b16314a6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2244,7 +2244,8 @@ dist_tmpfiles_DATA = \
tmpfiles.d/systemd-nologin.conf \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf \
- tmpfiles.d/var.conf
+ tmpfiles.d/var.conf \
+ tmpfiles.d/home.conf
if HAVE_SYSV_COMPAT
dist_tmpfiles_DATA += \
diff --git a/tmpfiles.d/home.conf b/tmpfiles.d/home.conf
new file mode 100644
index 0000000000..aa652b197f
--- /dev/null
+++ b/tmpfiles.d/home.conf
@@ -0,0 +1,11 @@
+# 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
+
+v /home 0755 - - -
+v /srv 0755 - - -
diff --git a/tmpfiles.d/var.conf b/tmpfiles.d/var.conf
index 9b7644476b..814652a22c 100644
--- a/tmpfiles.d/var.conf
+++ b/tmpfiles.d/var.conf
@@ -7,7 +7,7 @@
# See tmpfiles.d(5) for details
-d /var 0755 - - -
+v /var 0755 - - -
L /var/run - - - - ../run