40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
From 9ed2a35e93f4a9e82585f860f54cdcbbdf3e1f86 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Richard Weinberger <richard@nod.at>
|
||
|
|
Date: Tue, 9 Sep 2014 11:09:37 +0200
|
||
|
|
Subject: [PATCH] systemd-tmpfiles: Fix IGNORE_DIRECTORY_PATH age handling
|
||
|
|
|
||
|
|
If one has a config like:
|
||
|
|
d /tmp 1777 root root -
|
||
|
|
X /tmp/important_mount
|
||
|
|
|
||
|
|
All files below /tmp/important_mount will be deleted as the
|
||
|
|
/tmp/important_mount item will spuriously inherit a max age of 0
|
||
|
|
from /tmp.
|
||
|
|
/tmp has a max age of 0 but age_set is (of course) false.
|
||
|
|
|
||
|
|
This affects also the PrivateTmp feature of systemd.
|
||
|
|
All tmp files of such services will be deleted unconditionally
|
||
|
|
and can cause service failures and data loss.
|
||
|
|
|
||
|
|
Fix this by checking ->age_set in the IGNORE_DIRECTORY_PATH logic.
|
||
|
|
---
|
||
|
|
src/tmpfiles/tmpfiles.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git src/tmpfiles/tmpfiles.c src/tmpfiles/tmpfiles.c
|
||
|
|
index f9830c4..7eafd6b 100644
|
||
|
|
--- src/tmpfiles/tmpfiles.c
|
||
|
|
+++ src/tmpfiles/tmpfiles.c
|
||
|
|
@@ -1576,7 +1576,7 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
|
||
|
|
candidate_item = j;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (candidate_item) {
|
||
|
|
+ if (candidate_item && candidate_item->age_set) {
|
||
|
|
i->age = candidate_item->age;
|
||
|
|
i->age_set = true;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|