From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 25 Dec 2017 00:52:33 +0000 (+0100)
Subject: tools: honor --console and --console-log
X-Git-Tag: lxc-2.0.10~414
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3d3fd0b8214c950e6a8ddffbf5385aa8c0efb4b;p=thirdparty%2Flxc.git

tools: honor --console and --console-log

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

diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c
index eeb14e291..694627297 100644
--- a/src/lxc/tools/lxc_start.c
+++ b/src/lxc/tools/lxc_start.c
@@ -192,7 +192,7 @@ Options :\n\
 
 int main(int argc, char *argv[])
 {
-	int err = EXIT_FAILURE;
+	int i, err = EXIT_FAILURE;
 	struct lxc_conf *conf;
 	struct lxc_log log;
 	char *const *args;
@@ -320,7 +320,14 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	int i;
+	if (my_args.console)
+		if (!c->set_config_item(c, "lxc.console.path", my_args.console))
+			goto out;
+
+	if (my_args.console_log)
+		if (!c->set_config_item(c, "lxc.console.logfile", my_args.console_log))
+			goto out;
+
 	for (i = 0; i < LXC_NS_MAX; i++) {
 		if (my_args.share_ns[i] == NULL)
 			continue;