diff options
| author | Richard Weinberger <richard@nod.at> | 2014-09-09 11:09:37 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-09-26 17:38:40 +0200 |
| commit | 9ed2a35e93f4a9e82585f860f54cdcbbdf3e1f86 (patch) | |
| tree | 4a4eaabfca722b4db274693d70210307072521d3 /src/tmpfiles/tmpfiles.c | |
| parent | 37161c5148396448921841ae1026b281c7949652 (diff) | |
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.
Diffstat (limited to 'src/tmpfiles/tmpfiles.c')
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index f9830c431d..7eafd6bb30 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/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; } |