From 3f67f32de68fe8206691d31ce0bf47a175a965ec Mon Sep 17 00:00:00 2001 From: fly_fzc <2385803914@qq.com> Date: Tue, 31 Dec 2024 09:14:10 +0800 Subject: [PATCH] systemd-fstab-generator print logs only to kmsg --- ...ab-generator-print-logs-only-to-kmsg.patch | 30 +++++++++++++++++++ systemd.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 systemd-fstab-generator-print-logs-only-to-kmsg.patch diff --git a/systemd-fstab-generator-print-logs-only-to-kmsg.patch b/systemd-fstab-generator-print-logs-only-to-kmsg.patch new file mode 100644 index 00000000..bfc9d7bc --- /dev/null +++ b/systemd-fstab-generator-print-logs-only-to-kmsg.patch @@ -0,0 +1,30 @@ +From edba446b58f96db6d01968db0fc398be46188b72 Mon Sep 17 00:00:00 2001 +From: zhangyao +Date: Mon, 23 Dec 2024 16:14:37 +0800 +Subject: [PATCH] systemd-fstab-generator print logs only to kmsg + +--- + src/fstab-generator/fstab-generator.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c +index 016f3ba..54b84c0 100644 +--- a/src/fstab-generator/fstab-generator.c ++++ b/src/fstab-generator/fstab-generator.c +@@ -1631,6 +1631,13 @@ static int run(int argc, char **argv) { + } else { + /* Run in generator mode */ + log_setup_generator(); ++ /* ++ * Writing logs to the journal may cause sendmsg to time out, ++ * which leads to systemd startup failure. Therefore, we need ++ * to print logs only to kmsg. ++ */ ++ log_set_target(LOG_TARGET_KMSG); ++ log_open(); + + if (!IN_SET(strv_length(argv), 2, 4)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), +-- +2.33.0 + diff --git a/systemd.spec b/systemd.spec index 6212b5ff..8db789f2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -25,7 +25,7 @@ Name: systemd Url: https://systemd.io/ Version: 255 -Release: 36 +Release: 37 License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later Summary: System and Service Manager @@ -151,6 +151,7 @@ Patch9056: set-the-cpuset.cpus-mems-of-machine.slice-to-all-by-.patch Patch9057: add-a-new-switch-to-control-whether-udev-complies-wi.patch Patch9058: journal-don-t-enable-systemd-journald-audit.socket.patch Patch9059: systemd-logind-add-log-to-display-devices.patch +Patch9060: systemd-fstab-generator-print-logs-only-to-kmsg.patch Patch9801: Systemd-Add-sw64-architecture.patch Patch9802: backport-repart-fix-memory-leak.patch @@ -1707,6 +1708,9 @@ fi %{_unitdir}/veritysetup.target %changelog +* Tue Dec 31 2024 fuanan - 255-37 +- systemd-fstab-generator print logs only to kmsg + * Wed Dec 25 2024 wangyuhang - 255-36 - sync patches from systemd community -- Gitee