From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 24 Feb 2018 14:19:59 +0000 (+0100)
Subject: lxccontainer: load_config_locked()
X-Git-Tag: lxc-2.0.10~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c154b2380666d88cdef4a84afc997d975c0ff01;p=thirdparty%2Flxc.git

lxccontainer: load_config_locked()

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

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 7c129310c..4de0dc4f8 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -556,10 +556,13 @@ static bool load_config_locked(struct lxc_container *c, const char *fname)
 {
 	if (!c->lxc_conf)
 		c->lxc_conf = lxc_conf_init();
+
 	if (!c->lxc_conf)
 		return false;
+
 	if (lxc_config_read(fname, c->lxc_conf, false) != 0)
 		return false;
+
 	return true;
 }