rpms/systemd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

systemd-239-82.11

Browse Source 
Resolves: RHEL-118835
This commit is contained in:
Jan Macku 2025-12-02 14:47:44 +01:00
parent 9355bacf91
commit 39ee2c1fb1
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
1062-run-update-checks-to-allow-running-with-a-user-s-bus.patch Normal file
View File

@ -0,0 +1,47 @@
From b3d8c010014f19b8c563d3e13819620d2d068332 Mon Sep 17 00:00:00 2001
From: Anita Zhang <the.anitazha@gmail.com>
Date: Thu, 13 May 2021 01:17:51 -0700
Subject: [PATCH] run: update checks to allow running with a user's bus
systemd-run is documented to as being able to connect and run on a
specific user bus with "--user --machine=lennart@.host" arguments.
This PR updates some logic that prevented this from working.
(cherry picked from commit cbdc29492097e24ef3320280bc2a8dedbce02d9a)
Resolves: 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 9ad44e7b57..b1d2d6fa4a 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_LOCAL) {
- log_error("Execution in user context is not supported on non-local systems.");
+ if (arg_user && arg_transport == BUS_TRANSPORT_REMOTE) {
+ log_error("Execution in user context is not supported on remote systems.");
return -EINVAL;
}
- if (arg_scope && arg_transport != BUS_TRANSPORT_LOCAL) {
- log_error("Scope execution is not supported on non-local systems.");
+ if (arg_scope && arg_transport == BUS_TRANSPORT_REMOTE) {
+ log_error("Scope execution is not supported on remote 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)
+ if (arg_wait || arg_stdio != ARG_STDIO_NONE || (arg_user && arg_transport != BUS_TRANSPORT_LOCAL))
r = bus_connect_transport(arg_transport, arg_host, arg_user, &bus);
else
r = bus_connect_transport_systemd(arg_transport, arg_host, arg_user, &bus);

6
systemd.spec
View File

@ -13,7 +13,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 239
Release: 82%{?dist}.10
Release: 82%{?dist}.11
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: System and Service Manager
@ -1111,6 +1111,7 @@ Patch1058: 1058-pid1-do-not-use-generated-strings-as-format-strings-.patch
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
%ifarch %{ix86} x86_64 aarch64
%global have_gnu_efi 1
@ -1737,6 +1738,9 @@ fi
%files tests -f .file-list-tests
%changelog
* Tue Dec 02 2025 systemd maintenance team <systemd-maint@redhat.com> - 239-82.11
- run: update checks to allow running with a user's bus (RHEL-118835)
* Tue Dec 02 2025 systemd maintenance team <systemd-maint@redhat.com> - 239-82.10
- hwdb: add ACCEL_LOCATION property to parse_hwdb.py (RHEL-130979)
- hwdb: update ACCEL_LOCATION property to use Or instead of QuotedString (RHEL-130979)