Merge pull request #1879 from jordemort/lxc-execute-config-define-load

Call lxc_config_define_load from lxc_execute again

Merge pull request #1879 from jordemort/lxc-execute-config-define-load
b25c853b · Christian Brauner · GitHub · b4819bd8 · baebdaf9 · b25c853b
Unverified Commit b25c853b authored Oct 28, 2017 by Christian Brauner Committed by GitHub Oct 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

lxc_execute.c src/lxc/tools/lxc_execute.c +6 -0

No files found.
--- a/src/lxc/tools/lxc_execute.c
+++ b/src/lxc/tools/lxc_execute.c
@@ -168,6 +168,12 @@ int main(int argc, char *argv[])
 		}
 	}

+	ret = lxc_config_define_load(&defines, c->lxc_conf);
+	if (ret) {
+		lxc_container_put(c);
+		exit(EXIT_FAILURE);
+	}
+
 	if (my_args.uid)
 		c->lxc_conf->init_uid = my_args.uid;