summaryrefslogtreecommitdiff
path: root/src/machine/machinectl.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-02-18 23:32:55 +0100
committerLennart Poettering <lennart@poettering.net>2015-02-18 23:36:20 +0100
commit9c857b9d160c10b4454fc9f83442c1878343422f (patch)
treef6152bb50a8bb9dbf6fcecfc3599affa541d92b9 /src/machine/machinectl.c
parent04155c67139fdd983f08e61e8a56d27341a4ea72 (diff)
nspawn: when connected to pipes for stdin/stdout, pass them as-is to PID 1
Previously we always invoked the container PID 1 on /dev/console of the container. With this change we do so only if nspawn was invoked interactively (i.e. its stdin/stdout was connected to a TTY). In all other cases we directly pass through the fds unmodified. This has the benefit that nspawn can be added into shell pipelines. https://bugs.freedesktop.org/show_bug.cgi?id=87732
Diffstat (limited to 'src/machine/machinectl.c')
-rw-r--r--src/machine/machinectl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 053c8fbbe7..55cd854289 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1150,7 +1150,7 @@ static int login_machine(int argc, char *argv[], void *userdata) {
sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
- r = pty_forward_new(event, master, true, &forward);
+ r = pty_forward_new(event, master, true, false, &forward);
if (r < 0)
return log_error_errno(r, "Failed to create PTY forwarder: %m");