From 30acbadc6a7771364159a657743d011c21be4d8d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 26 Nov 2018 17:48:22 +0100 Subject: [PATCH] journald: don't try to rotate user journals in /var/log/journal/ if we are still in log-to-runtime-journal mode Fixes: #10879 --- src/journal/journald-server.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 9a5e7f6..f7df39b 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -550,9 +550,11 @@ void server_rotate(Server *s) { ordered_hashmap_remove(s->user_journals, k); } - /* Finally, also rotate all user journals we currently do not have open. */ - r = open_user_journal_directory(s, &d, &path); - if (r >= 0) { + /* Finally, also rotate all user journals we currently do not have open. (But do so only if we actually have + * access to /var, i.e. are not in the log-to-runtime-journal mode). */ + if (!s->runtime_journal && + open_user_journal_directory(s, &d, &path) >= 0) { + struct dirent *de; FOREACH_DIRENT(de, d, log_warning_errno(errno, "Failed to enumerate %s, ignoring: %m", path)) { -- 2.7.4