From: Jan Kundrát <jan.kundrat@cesnet.cz>
Date: Sat, 2 Nov 2019 15:42:01 +0000 (+0100)
Subject: journalctl: allow running vacuum on remote journals, too
X-Git-Tag: v244-rc1~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c488660e6edb3c1375ab62514a8df035c3d712bf;p=thirdparty%2Fsystemd.git

journalctl: allow running vacuum on remote journals, too

Right now the `systemd-journal-remote` service does not constrain its
resource usage (I just run out of space on my 100GB partition, for
example). This patch does not change that, but it at least makes it
possible to run something like:

  journalctl --directory /var/log/journal/remote --rotate --vacuum-size=90G

fixes #2376

Co-authored-by: Mike Auty <ikelos@gentoo.org>
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 771c5c1730e..e5a2f6efcf4 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2240,9 +2240,6 @@ int main(int argc, char *argv[]) {
                 HASHMAP_FOREACH(d, j->directories_by_path, i) {
                         int q;
 
-                        if (d->is_root)
-                                continue;
-
                         q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_n_files, arg_vacuum_time, NULL, !arg_quiet);
                         if (q < 0) {
                                 log_error_errno(q, "Failed to vacuum %s: %m", d->path);