blob: d16f3a2dca64b614fbbaca4a079940d53f45f9e8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From 05e1b853abfd54d117dad25185c602d1791d83f6 Mon Sep 17 00:00:00 2001
From: David Cobbley <david.j.cobbley@linux.intel.com>
Date: Tue, 26 Jun 2018 16:10:14 -0700
Subject: [PATCH] ro-rootfs-tmpfile-defaults
---
tmpfiles.d/home.conf | 1 -
tmpfiles.d/tmp.conf | 1 -
tmpfiles.d/var.conf.m4 | 5 ++++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tmpfiles.d/home.conf b/tmpfiles.d/home.conf
index 9f25b83..5c7513a 100644
--- a/tmpfiles.d/home.conf
+++ b/tmpfiles.d/home.conf
@@ -8,4 +8,3 @@
# See tmpfiles.d(5) for details
Q /home 0755 - - -
-q /srv 0755 - - -
diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
index 22555a0..aad1b98 100644
--- a/tmpfiles.d/tmp.conf
+++ b/tmpfiles.d/tmp.conf
@@ -9,7 +9,6 @@
# Clear tmp directories separately, to make them easier to override
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.m4 b/tmpfiles.d/var.conf.m4
index 0e2c509..fa288b8 100644
--- a/tmpfiles.d/var.conf.m4
+++ b/tmpfiles.d/var.conf.m4
@@ -11,7 +11,10 @@ q /var 0755 - - -
L /var/run - - - - ../run
-d /var/log 0755 - - -
+# now /var/log and /var/tmp really live in volatile
+L /var/log - - - - volatile/log
+L /var/tmp - - - - volatile/tmp
+
m4_ifdef(`ENABLE_UTMP',
f /var/log/wtmp 0664 root utmp -
f /var/log/btmp 0660 root utmp -
--
2.7.4
|
