38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
|
From 985837dab9c892858a92ae50043843307f5e0714 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Fri, 19 Jul 2019 18:29:11 +0200
|
||
|
|
Subject: [PATCH] core: try to reopen /dev/kmsg again right after mounting /dev
|
||
|
|
|
||
|
|
I was debugging stuff during early boot, and was confused that I never
|
||
|
|
found the logs for it in kmsg. The reason for that was that /proc is
|
||
|
|
generally not mounted the first time we do log_open() and hence
|
||
|
|
log_set_target(LOG_TARGET_KMSG) we do when running as PID 1 had not
|
||
|
|
effect. A lot later during start-up we call log_open() again where this
|
||
|
|
is fixed (after the point where we close all remaining fds still open),
|
||
|
|
but in the meantime no logs every got written to kmsg. This patch fixes
|
||
|
|
that.
|
||
|
|
|
||
|
|
(cherry picked from commit 0a2eef1ee1fef74be9d12f7dc4d0006b645b579c)
|
||
|
|
|
||
|
|
Resolves: #1749212
|
||
|
|
---
|
||
|
|
src/core/main.c | 5 +++++
|
||
|
|
1 file changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/core/main.c b/src/core/main.c
|
||
|
|
index 44dd8348be..af7b26d6f1 100644
|
||
|
|
--- a/src/core/main.c
|
||
|
|
+++ b/src/core/main.c
|
||
|
|
@@ -2215,6 +2215,11 @@ int main(int argc, char *argv[]) {
|
||
|
|
goto finish;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /* Let's open the log backend a second time, in case the first time didn't
|
||
|
|
+ * work. Quite possibly we have mounted /dev just now, so /dev/kmsg became
|
||
|
|
+ * available, and it previously wasn't. */
|
||
|
|
+ log_open();
|
||
|
|
+
|
||
|
|
r = initialize_security(
|
||
|
|
&loaded_policy,
|
||
|
|
&security_start_timestamp,
|