Merge pull request #1338 from Blub/tools-configfile

tools: lxc-start: set configfile after load_config

Merge pull request #1338 from Blub/tools-configfile
8500665f · Christian Brauner · GitHub · aee937d0 · b586db43 · 8500665f
Commit 8500665f authored Dec 02, 2016 by Christian Brauner Committed by GitHub Dec 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

lxc_start.c src/lxc/tools/lxc_start.c +5 -0

No files found.
--- a/src/lxc/tools/lxc_start.c
+++ b/src/lxc/tools/lxc_start.c
@@ -259,6 +259,11 @@ int main(int argc, char *argv[])
 			lxc_container_put(c);
 			exit(err);
 		}
+		c->configfile = strdup(my_args.rcfile);
+		if (!c->configfile) {
+			ERROR("Out of memory setting new config filename");
+			goto out;
+		}
 	} else {
 		int rc;