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

terminal: lxc_terminal_setup()

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

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index 3369603b0..715982bb5 100644
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -907,8 +907,8 @@ int lxc_terminal_setup(struct lxc_conf *conf)
 	int ret;
 	struct lxc_terminal *terminal = &conf->console;
 
-	if (terminal->path && !strcmp(terminal->path, "none")) {
-		INFO("No terminal was requested");
+	if (terminal->path && strcmp(terminal->path, "none") == 0) {
+		INFO("No terminal requested");
 		return 0;
 	}
 
@@ -916,12 +916,10 @@ int lxc_terminal_setup(struct lxc_conf *conf)
 	if (ret < 0)
 		return -1;
 
-	/* create terminal log file */
 	ret = lxc_terminal_create_log_file(terminal);
 	if (ret < 0)
 		goto err;
 
-	/* create terminal ringbuffer */
 	ret = lxc_terminal_create_ringbuf(terminal);
 	if (ret < 0)
 		goto err;