From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 28 Feb 2018 11:45:07 +0000 (+0100)
Subject: terminal: lxc_console()
X-Git-Tag: lxc-3.0.0.beta1~4^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71ac3f071bc2f54a503167676e1bdfc50bb38a31;p=thirdparty%2Flxc.git

terminal: lxc_console()

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

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index a801b2669..a695dff65 100644
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -1026,7 +1026,7 @@ int lxc_console(struct lxc_container *c, int ttynum,
 		int stdinfd, int stdoutfd, int stderrfd,
 		int escape)
 {
-	int ret, ttyfd, masterfd;
+	int masterfd, ret, ttyfd;
 	struct lxc_epoll_descr descr;
 	struct termios oldtios;
 	struct lxc_terminal_state *ts;
@@ -1055,7 +1055,7 @@ int lxc_console(struct lxc_container *c, int ttynum,
 		lxc_terminal_winsz(stdinfd, masterfd);
 		lxc_cmd_terminal_winch(ts->winch_proxy, ts->winch_proxy_lxcpath);
 	} else {
-		INFO("File descriptor %d does not refer to a tty device", stdinfd);
+		INFO("File descriptor %d does not refer to a terminal", stdinfd);
 	}
 
 	ret = lxc_mainloop_open(&descr);