From 7b5ff4391c99da1f6b4aef67b08bc77c0748385b Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Tue, 5 Sep 2023 12:52:28 +0800 Subject: [PATCH 1/3] journalctl: reset --lines= correctly if no argument Follow-up for 8d6791d2aa98c989101f572278e9b0a63edfec42 --- src/journal/journalctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index f1c19af1b2..48747929be 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -330,6 +330,7 @@ static int parse_lines(const char *arg, bool graceful) { default_noarg: arg_lines = 10; + arg_lines_oldest = false; return 0; } From 11da61658f529a16495319dbaae7d4d9911edc9b Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Tue, 5 Sep 2023 12:55:45 +0800 Subject: [PATCH 2/3] systemctl: drop unnecessary else Follow-up for 8a826a979aa51703ec45dbecc34691265b4d04e0 --- src/systemctl/systemctl-start-unit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/systemctl/systemctl-start-unit.c b/src/systemctl/systemctl-start-unit.c index 8268217967..551e6f6768 100644 --- a/src/systemctl/systemctl-start-unit.c +++ b/src/systemctl/systemctl-start-unit.c @@ -168,8 +168,9 @@ fail: log_debug_errno(r, "Failed to %s %s, ignoring: %s", job_type, name, bus_error_message(error, r)); return 0; - } else - log_error_errno(r, "Failed to %s %s: %s", job_type, name, bus_error_message(error, r)); + } + + log_error_errno(r, "Failed to %s %s: %s", job_type, name, bus_error_message(error, r)); if (!sd_bus_error_has_names(error, BUS_ERROR_NO_SUCH_UNIT, BUS_ERROR_UNIT_MASKED, From 8a5aba5be336ea36fc1ebe3c8f419529f5163e59 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Tue, 5 Sep 2023 12:57:28 +0800 Subject: [PATCH 3/3] systemd.catalog: freezed -> froze Follow-up for 1dc604d821b6f9519e1961b154ae37baad57dbb1 --- catalog/systemd.catalog.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index d4b92718ac..fd83d1e3dd 100644 --- a/catalog/systemd.catalog.in +++ b/catalog/systemd.catalog.in @@ -206,11 +206,11 @@ Support: %SUPPORT_URL% Reboot has failed when systemd attempted to reboot after a crash. -- 645c735537634ae0a32b15a7c6cba7d4 -Subject: Init execution freezed +Subject: Init execution froze Defined-By: systemd Support: %SUPPORT_URL% -Systemd freezed execution after fatal error. +Systemd froze execution after fatal error. -- 5addb3a06a734d3396b794bf98fb2d01 Subject: Init received fatal signal while coredump is disabled