From 8adcfa40b029b11bb2512c8cc7e6301ee3a77df9 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 15 Aug 2025 13:51:06 +0200 Subject: [PATCH] systemd-257-13 Resolves: RHEL-106260 --- ...-do-not-attempt-to-log-n-a-as-a-jour.patch | 46 +++++++++++++++++++ systemd.spec | 6 ++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 0438-core-transaction-do-not-attempt-to-log-n-a-as-a-jour.patch diff --git a/0438-core-transaction-do-not-attempt-to-log-n-a-as-a-jour.patch b/0438-core-transaction-do-not-attempt-to-log-n-a-as-a-jour.patch new file mode 100644 index 0000000..37c083d --- /dev/null +++ b/0438-core-transaction-do-not-attempt-to-log-n-a-as-a-jour.patch @@ -0,0 +1,46 @@ +From c42a40336da772df915c3be2682a39774e75ef23 Mon Sep 17 00:00:00 2001 +From: Mike Yuan +Date: Mon, 30 Jun 2025 17:57:08 +0200 +Subject: [PATCH] core/transaction: do not attempt to log "n/a" as a journal + field + +Follow-up for 3cf6a3a3d4acf8347ccd0250274f517e6b2e9fe6 + +(cherry picked from commit 1c8d653d2b8a82ed3944f03c2dea25ad1e2cc967) + +Related: RHEL-106260 +--- + src/core/transaction.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/core/transaction.c b/src/core/transaction.c +index 5ad43ea378..bec96a67af 100644 +--- a/src/core/transaction.c ++++ b/src/core/transaction.c +@@ -413,7 +413,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi + log_struct(LOG_ERR, + LOG_UNIT_MESSAGE(j->unit, "%s", cycle_path_text), + LOG_MESSAGE_ID(SD_MESSAGE_UNIT_ORDERING_CYCLE_STR), +- LOG_ITEM("%s", strna(unit_ids))); ++ LOG_ITEM("%s", strempty(unit_ids))); + + if (delete) { + const char *status; +@@ -426,7 +426,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi + LOG_MESSAGE_ID(SD_MESSAGE_DELETING_JOB_BECAUSE_ORDERING_CYCLE_STR), + LOG_ITEM("DELETED_UNIT=%s", delete->unit->id), + LOG_ITEM("DELETED_TYPE=%s", job_type_to_string(delete->type)), +- LOG_ITEM("%s", strna(unit_ids))); ++ LOG_ITEM("%s", strempty(unit_ids))); + + if (log_get_show_color()) + status = ANSI_HIGHLIGHT_RED " SKIP " ANSI_NORMAL; +@@ -446,7 +446,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi + LOG_UNIT_MESSAGE(j->unit, "Unable to break cycle starting with %s/%s", + j->unit->id, job_type_to_string(j->type)), + LOG_MESSAGE_ID(SD_MESSAGE_CANT_BREAK_ORDERING_CYCLE_STR), +- LOG_ITEM("%s", strna(unit_ids))); ++ LOG_ITEM("%s", strempty(unit_ids))); + + return sd_bus_error_setf(e, BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC, + "Transaction order is cyclic. See system logs for details."); diff --git a/systemd.spec b/systemd.spec index 6a31ffe..1b2bfd7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -48,7 +48,7 @@ Url: https://systemd.io # Allow users to specify the version and release when building the rpm by # setting the %%version_override and %%release_override macros. Version: %{?version_override}%{!?version_override:257} -Release: 12%{?dist} +Release: 13%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -547,6 +547,7 @@ Patch0434: 0434-Revert-hwdb-disable-Asus-ROG-keyboards-sending-power.patch Patch0435: 0435-hwdb-Add-launch-emoji-keyboard-mapping-for-Asus-M160.patch Patch0436: 0436-Enable-KEY_PERFORMANCE-key-present-on-Linux-6.17.patch Patch0437: 0437-hwdb-add-HP-150-Wired-Mouse-37341.patch +Patch0438: 0438-core-transaction-do-not-attempt-to-log-n-a-as-a-jour.patch # Downstream-only patches (9000–9999) %endif @@ -1493,6 +1494,9 @@ rm -f .file-list-* rm -f %{name}.lang %changelog +* Fri Aug 15 2025 systemd maintenance team - 257-13 +- core/transaction: do not attempt to log "n/a" as a journal field (RHEL-106260) + * Wed Aug 13 2025 systemd maintenance team - 257-12 - mkosi: use C10S repo for building RPMs (RHEL-79976) - test: adapt TEST-22 to the downstream --purge behavior (RHEL-79976)