]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
machined: set TTYPath for container shell
authorLudwig Nussel <ludwig.nussel@suse.de>
Tue, 21 Dec 2021 10:38:49 +0000 (11:38 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 23 Dec 2021 10:27:56 +0000 (11:27 +0100)
TTYPath is needed for proper utmp registration of the shell to
receive wall messages.

src/machine/machine-dbus.c

index 4fa5fe5452e681e07bfc4412c8507e97ed83e3e8..8f11afd65bf5280ae561c341108f170643dc1c6a 100644 (file)
@@ -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",