From 6c8af9c6e89d4f4c498de73c9e150792c819f565 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 5 Dec 2025 10:18:50 +0100 Subject: [PATCH] systemd-239-82.12 Resolves: RHEL-118835 --- ...e-checks-to-allow-running-with-a-use.patch | 44 +++++++++++++++++++ systemd.spec | 6 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 1063-Revert-run-update-checks-to-allow-running-with-a-use.patch diff --git a/1063-Revert-run-update-checks-to-allow-running-with-a-use.patch b/1063-Revert-run-update-checks-to-allow-running-with-a-use.patch new file mode 100644 index 0000000..98ae2f7 --- /dev/null +++ b/1063-Revert-run-update-checks-to-allow-running-with-a-use.patch @@ -0,0 +1,44 @@ +From c3767a4460b41af817e01160e4bc201871f3bedd Mon Sep 17 00:00:00 2001 +From: Jan Macku +Date: Thu, 4 Dec 2025 15:18:22 +0100 +Subject: [PATCH] Revert "run: update checks to allow running with a user's + bus" + +This reverts commit b3d8c010014f19b8c563d3e13819620d2d068332. + +Related: RHEL-118835 +--- + src/run/run.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/run/run.c b/src/run/run.c +index b1d2d6fa4a..9ad44e7b57 100644 +--- a/src/run/run.c ++++ b/src/run/run.c +@@ -415,13 +415,13 @@ static int parse_argv(int argc, char *argv[]) { + return -EINVAL; + } + +- if (arg_user && arg_transport == BUS_TRANSPORT_REMOTE) { +- log_error("Execution in user context is not supported on remote systems."); ++ if (arg_user && arg_transport != BUS_TRANSPORT_LOCAL) { ++ log_error("Execution in user context is not supported on non-local systems."); + return -EINVAL; + } + +- if (arg_scope && arg_transport == BUS_TRANSPORT_REMOTE) { +- log_error("Scope execution is not supported on remote systems."); ++ if (arg_scope && arg_transport != BUS_TRANSPORT_LOCAL) { ++ log_error("Scope execution is not supported on non-local systems."); + return -EINVAL; + } + +@@ -1495,7 +1495,7 @@ int main(int argc, char* argv[]) { + + /* If --wait is used connect via the bus, unconditionally, as ref/unref is not supported via the limited direct + * connection */ +- if (arg_wait || arg_stdio != ARG_STDIO_NONE || (arg_user && arg_transport != BUS_TRANSPORT_LOCAL)) ++ if (arg_wait || arg_stdio != ARG_STDIO_NONE) + r = bus_connect_transport(arg_transport, arg_host, arg_user, &bus); + else + r = bus_connect_transport_systemd(arg_transport, arg_host, arg_user, &bus); diff --git a/systemd.spec b/systemd.spec index 4969f40..4271b28 100644 --- a/systemd.spec +++ b/systemd.spec @@ -13,7 +13,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 239 -Release: 82%{?dist}.11 +Release: 82%{?dist}.12 # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -1112,6 +1112,7 @@ Patch1059: 1059-core-transaction-make-merge_unit_ids-always-return-N.patch Patch1060: 1060-core-transaction-make-merge_unit_ids-return-non-NULL.patch Patch1061: 1061-core-transaction-do-not-log-null.patch Patch1062: 1062-run-update-checks-to-allow-running-with-a-user-s-bus.patch +Patch1063: 1063-Revert-run-update-checks-to-allow-running-with-a-use.patch %ifarch %{ix86} x86_64 aarch64 %global have_gnu_efi 1 @@ -1738,6 +1739,9 @@ fi %files tests -f .file-list-tests %changelog +* Fri Dec 05 2025 systemd maintenance team - 239-82.12 +- Revert "run: update checks to allow running with a user's bus" (RHEL-118835) + * Tue Dec 02 2025 systemd maintenance team - 239-82.11 - run: update checks to allow running with a user's bus (RHEL-118835)