From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Tue, 21 Dec 2021 10:38:49 +0000 (+0100)
Subject: machined: set TTYPath for container shell
X-Git-Tag: v250~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9c97bbbfb271d68b2ca4f3aa346fdf5e9c70c27;p=thirdparty%2Fsystemd.git

machined: set TTYPath for container shell

TTYPath is needed for proper utmp registration of the shell to
receive wall messages.
---

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 4fa5fe5452e..8f11afd65bf 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -688,7 +688,7 @@ int bus_machine_method_open_shell(sd_bus_message *message, void *userdata, sd_bu
 
         description = strjoina("Shell for User ", user);
         r = sd_bus_message_append(tm,
-                                  "(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)",
+                                  "(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)(sv)",
                                   "Description", "s", description,
                                   "StandardInputFileDescriptor", "h", slave,
                                   "StandardOutputFileDescriptor", "h", slave,
@@ -696,6 +696,7 @@ int bus_machine_method_open_shell(sd_bus_message *message, void *userdata, sd_bu
                                   "SendSIGHUP", "b", true,
                                   "IgnoreSIGPIPE", "b", false,
                                   "KillMode", "s", "mixed",
+                                  "TTYPath", "s", pty_name,
                                   "TTYReset", "b", true,
                                   "UtmpIdentifier", "s", utmp_id,
                                   "UtmpMode", "s", "user",