Merge pull request #2430 from duguhaotian/work

src/lxc/attach.c

@@ -24,6 +24,7 @@
 #define _GNU_SOURCE
 #include <errno.h>
 #include <fcntl.h>
+#include <termios.h>
 #include <grp.h>
 #include <pwd.h>
 #include <signal.h>
@@ -979,6 +980,7 @@ static int lxc_attach_terminal(struct lxc_conf *conf,
 			       struct lxc_terminal *terminal)
 {
 	int ret;
+	struct termios oldtios;
 
 	lxc_terminal_init(terminal);
 
@@ -988,6 +990,12 @@ static int lxc_attach_terminal(struct lxc_conf *conf,
 		return -1;
 	}
 
+	ret = lxc_setup_tios(terminal->master, &oldtios);
+	if (ret < 0) {
+		SYSERROR("Failed to setup terminal");
+		return -1;
+	}
+
 	/* Shift ttys to container. */
 	ret = lxc_terminal_map_ids(conf, terminal);
 	if (ret < 0) {

src/lxc/terminal.c

@@ -510,6 +510,7 @@ int lxc_setup_tios(int fd, struct termios *oldtios)
 #ifdef IEXTEN
 	newtios.c_lflag &= ~IEXTEN;
 #endif
+	newtios.c_oflag &= ~ONLCR;
 	newtios.c_oflag |= OPOST;
 	newtios.c_cc[VMIN] = 1;
 	newtios.c_cc[VTIME] = 0;
@@ -896,6 +897,7 @@ int lxc_terminal_setup(struct lxc_conf *conf)
 {
 	int ret;
 	struct lxc_terminal *terminal = &conf->console;
+	struct termios oldtios;
 
 	if (terminal->path && strcmp(terminal->path, "none") == 0) {
 		INFO("No terminal requested");
@@ -906,6 +908,10 @@ int lxc_terminal_setup(struct lxc_conf *conf)
 	if (ret < 0)
 		return -1;
 
+	ret = lxc_setup_tios(terminal->master, &oldtios);
+	if (ret < 0)
+		return -1;
+
 	ret = lxc_terminal_create_log_file(terminal);
 	if (ret < 0)
 		goto err;