- Import commit 5a8eadd0c021758337a020c423f25a353bdb9b3c (merge of v255.8)
For a complete list of changes, visit:
603cd1d4d8...5a8eadd0c0
- Drop 5003-Revert-run-pass-the-pty-slave-fd-to-transient-servic.patch as v255.8
contains the workaround (commit 639c922ede9485) for the broken commit
28459ba1f4df.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1536
This commit is contained in:
parent
638de11012
commit
735f8c4ba4
@ -1,39 +0,0 @@
|
|||||||
From 51f4a0be4895bedbde9b23339a5953d965411334 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Franck Bui <fbui@suse.com>
|
|
||||||
Date: Thu, 6 Jun 2024 15:15:56 +0200
|
|
||||||
Subject: [PATCH 5003/5003] Revert "run: pass the pty slave fd to transient
|
|
||||||
service"
|
|
||||||
|
|
||||||
This reverts commit 182b80bede28ef6e9c0d0edd34c56a467d22dee5.
|
|
||||||
---
|
|
||||||
src/run/run.c | 12 +++---------
|
|
||||||
1 file changed, 3 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/run/run.c b/src/run/run.c
|
|
||||||
index 14cc9f9514..4c4a76638d 100644
|
|
||||||
--- a/src/run/run.c
|
|
||||||
+++ b/src/run/run.c
|
|
||||||
@@ -808,17 +808,11 @@ static int transient_service_set_properties(sd_bus_message *m, const char *pty_p
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pty_path) {
|
|
||||||
- _cleanup_close_ int pty_slave = -EBADF;
|
|
||||||
-
|
|
||||||
- pty_slave = open_terminal(pty_path, O_RDWR|O_NOCTTY|O_CLOEXEC);
|
|
||||||
- if (pty_slave < 0)
|
|
||||||
- return pty_slave;
|
|
||||||
-
|
|
||||||
r = sd_bus_message_append(m,
|
|
||||||
"(sv)(sv)(sv)(sv)",
|
|
||||||
- "StandardInputFileDescriptor", "h", pty_slave,
|
|
||||||
- "StandardOutputFileDescriptor", "h", pty_slave,
|
|
||||||
- "StandardErrorFileDescriptor", "h", pty_slave,
|
|
||||||
+ "StandardInput", "s", "tty",
|
|
||||||
+ "StandardOutput", "s", "tty",
|
|
||||||
+ "StandardError", "s", "tty",
|
|
||||||
"TTYPath", "s", pty_path);
|
|
||||||
if (r < 0)
|
|
||||||
return bus_log_create_error(r);
|
|
||||||
--
|
|
||||||
2.35.3
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:59f09021d3db1bef3f3ee27aeff4ed734c1226d3a9538eca7cc9de291fa483e9
|
|
||||||
size 10852252
|
|
3
systemd-v255.8+suse.34.g5a8eadd0c0.tar.xz
Normal file
3
systemd-v255.8+suse.34.g5a8eadd0c0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4e6f15b8cbc6864bc953622f67da36ea5baac3514386f4907785a8b0d9a3a106
|
||||||
|
size 10850648
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 1 08:35:26 UTC 2024 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
- Import commit 5a8eadd0c021758337a020c423f25a353bdb9b3c (merge of v255.8)
|
||||||
|
|
||||||
|
For a complete list of changes, visit:
|
||||||
|
https://github.com/openSUSE/systemd/compare/603cd1d4d81147d4f2eccd5e352064a4215119b4...5a8eadd0c021758337a020c423f25a353bdb9b3c
|
||||||
|
|
||||||
|
- Drop 5003-Revert-run-pass-the-pty-slave-fd-to-transient-servic.patch as v255.8
|
||||||
|
contains the workaround (commit 639c922ede9485) for the broken commit
|
||||||
|
28459ba1f4df.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jun 24 14:36:21 UTC 2024 - Franck Bui <fbui@suse.com>
|
Mon Jun 24 14:36:21 UTC 2024 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
@ -26,9 +26,9 @@
|
|||||||
%define systemd_release %{?release_override}%{!?release_override:0}
|
%define systemd_release %{?release_override}%{!?release_override:0}
|
||||||
%define archive_version %{nil}
|
%define archive_version %{nil}
|
||||||
%else
|
%else
|
||||||
%define systemd_version 255.7
|
%define systemd_version 255.8
|
||||||
%define systemd_release 0
|
%define systemd_release 0
|
||||||
%define archive_version +suse.33.g603cd1d4d8
|
%define archive_version +suse.34.g5a8eadd0c0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define systemd_major %{sub %systemd_version 1 3}
|
%define systemd_major %{sub %systemd_version 1 3}
|
||||||
@ -233,7 +233,6 @@ Patch: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch
|
|||||||
# will be removed as soon as a proper fix will be merged by upstream.
|
# will be removed as soon as a proper fix will be merged by upstream.
|
||||||
Patch: 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch
|
Patch: 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch
|
||||||
Patch: 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch
|
Patch: 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch
|
||||||
Patch: 5003-Revert-run-pass-the-pty-slave-fd-to-transient-servic.patch
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
Loading…
Reference in New Issue
Block a user