diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-12-18 19:24:00 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-12-18 19:26:10 +0100 |
| commit | 8674debc67cdad04d930d931405a360f15e5cb28 (patch) | |
| tree | 39fe22abc5a55f026f3134d3e6f7c9c190207b6c | |
| parent | 8e959fbf3862172b53d200cda659795c3744fa78 (diff) | |
Revert "ptyfwd: make master terminal attributes raw, too"
This reverts commit e7d43b3cc30764138c90eaaf95d3d8f49e448890.
This broke the console terminal when booting up a container, so let's
not do this.
| -rw-r--r-- | src/shared/ptyfwd.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c index 85fc8f1b34..72aa59efb7 100644 --- a/src/shared/ptyfwd.c +++ b/src/shared/ptyfwd.c @@ -343,8 +343,8 @@ static int process_pty_loop(int master, sigset_t *mask, pid_t kill_pid, int sign int process_pty(int master, sigset_t *mask, pid_t kill_pid, int signo) { struct termios saved_stdin_attr, raw_stdin_attr; struct termios saved_stdout_attr, raw_stdout_attr; - struct termios master_attr; - bool saved_stdin = false, saved_stdout = false; + bool saved_stdin = false; + bool saved_stdout = false; struct winsize ws; int r; @@ -369,11 +369,6 @@ int process_pty(int master, sigset_t *mask, pid_t kill_pid, int signo) { tcsetattr(STDOUT_FILENO, TCSANOW, &raw_stdout_attr); } - if (tcgetattr(master, &master_attr) >= 0) { - cfmakeraw(&master_attr); - tcsetattr(master, TCSANOW, &master_attr); - } - r = process_pty_loop(master, mask, kill_pid, signo); if (saved_stdout) |