journald: do not allow persistent journal storage in the initrd

If the user managed to configure persistent storage in the journal
in the initrd, e.g. by creating /var/log/journal with default of 'auto',
we could end up writing entries there. Let's make sure this doesn't
happen.

diff --git a/src/journal/journald-config.c b/src/journal/journald-config.c
index de78a40008fd2066986255adac29782cf2f2a216..b524379b5c46f5842a3f489f52c5c4409d4bf861 100644 (file)
--- a/src/journal/journald-config.c
+++ b/src/journal/journald-config.c
@@ -5,6 +5,7 @@
 #include "conf-parser.h"
 #include "creds-util.h"
 #include "daemon-util.h"
+#include "initrd-util.h"
 #include "journald-audit.h"
 #include "journald-config.h"
 #include "journald-context.h"
@@ -117,6 +118,11 @@ void manager_merge_configs(Manager *m) {
         journal_config_done(&m->config);
 
         MERGE_NON_NEGATIVE(storage, JOURNAL_STORAGE_DEFAULT_VAL);
+
+        /* In the initrd, only 'none' and 'volatile' make sense. */
+        if (in_initrd() && IN_SET(m->config.storage, STORAGE_PERSISTENT, STORAGE_AUTO))
+                m->config.storage = STORAGE_VOLATILE;
+
         manager_merge_journal_compress_options(m);
         MERGE_NON_NEGATIVE(seal, true);
         /* By default, /dev/kmsg is read only by the main namespace instance. */