terminal: lxc_terminal_setup()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-02-28 12:23:06 +01:00
parent 8ded924414
commit 1a443ac10c
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D

View File

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