summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-21 19:47:28 +0200
committerLennart Poettering <lennart@poettering.net>2015-10-22 01:59:25 +0200
commit822cd601357f6f45d0176ae38fe9f86077462f06 (patch)
tree564173446482954208953c58f0d5d9226fb2bb25
parent5fb13eb51bf641a3434828947e137e1a5f2d7eb2 (diff)
downloadsystemd-822cd601357f6f45d0176ae38fe9f86077462f06.tar.gz
systemd-822cd601357f6f45d0176ae38fe9f86077462f06.tar.bz2
systemd-822cd601357f6f45d0176ae38fe9f86077462f06.zip
tmpfiles.d: change all subvolumes to use quota
Let's make sure the subvolumes we create fit into a sensible definition of a quota tree.
-rw-r--r--tmpfiles.d/home.conf4
-rw-r--r--tmpfiles.d/systemd-nspawn.conf2
-rw-r--r--tmpfiles.d/tmp.conf4
-rw-r--r--tmpfiles.d/var.conf2
4 files changed, 6 insertions, 6 deletions
diff --git a/tmpfiles.d/home.conf b/tmpfiles.d/home.conf
index aa652b197f..9f25b83392 100644
--- a/tmpfiles.d/home.conf
+++ b/tmpfiles.d/home.conf
@@ -7,5 +7,5 @@
# See tmpfiles.d(5) for details
-v /home 0755 - - -
-v /srv 0755 - - -
+Q /home 0755 - - -
+q /srv 0755 - - -
diff --git a/tmpfiles.d/systemd-nspawn.conf b/tmpfiles.d/systemd-nspawn.conf
index 5a3124a0fc..9fa3878d6b 100644
--- a/tmpfiles.d/systemd-nspawn.conf
+++ b/tmpfiles.d/systemd-nspawn.conf
@@ -7,7 +7,7 @@
# See tmpfiles.d(5) for details
-v /var/lib/machines 0700 - - -
+Q /var/lib/machines 0700 - - -
# Remove old temporary snapshots, but only at boot. Ideally we'd have
# "self-destroying" btrfs snapshots that go away if the last last
diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
index ffdd82fd9c..6bbd1aa341 100644
--- a/tmpfiles.d/tmp.conf
+++ b/tmpfiles.d/tmp.conf
@@ -8,8 +8,8 @@
# See tmpfiles.d(5) for details
# Clear tmp directories separately, to make them easier to override
-v /tmp 1777 root root 10d
-v /var/tmp 1777 root root 30d
+q /tmp 1777 root root 10d
+q /var/tmp 1777 root root 30d
# Exclude namespace mountpoints created with PrivateTmp=yes
x /tmp/systemd-private-%b-*
diff --git a/tmpfiles.d/var.conf b/tmpfiles.d/var.conf
index 472680c3bf..ae7952e77a 100644
--- a/tmpfiles.d/var.conf
+++ b/tmpfiles.d/var.conf
@@ -7,7 +7,7 @@
# See tmpfiles.d(5) for details
-v /var 0755 - - -
+q /var 0755 - - -
L /var/run - - - - ../run