picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "ptyfwd: make master terminal attributes raw, too"

Browse source 
This reverts commit e7d43b3cc3.

This broke the console terminal when booting up a container, so let's
not do this.
This commit is contained in:
Lennart Poettering 2013-12-18 19:24:00 +01:00
parent 8e959fbf38
commit 8674debc67
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/shared/ptyfwd.c
View file

@ -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)