From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 1 Jul 2021 08:22:56 +0000 (+0200)
Subject: terminal: ensure newlines are turned into newlines+carriage return for terminal output
X-Git-Tag: lxc-5.0.0~146^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3892%2Fhead;p=thirdparty%2Flxc.git

terminal: ensure newlines are turned into newlines+carriage return for terminal output

Fixes: #3879
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index df3fc3c01..029e36bbb 100644
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -474,7 +474,7 @@ int lxc_setup_tios(int fd, struct termios *oldtios)
 #ifdef IEXTEN
 	newtios.c_lflag &= ~IEXTEN;
 #endif
-	newtios.c_oflag &= ~ONLCR;
+	newtios.c_oflag |= ONLCR;
 	newtios.c_oflag |= OPOST;
 	newtios.c_cc[VMIN] = 1;
 	newtios.c_cc[VTIME] = 0;