load_config_locked: update unexp network

When we read a lxc.network.hwaddr line, if it contained any 'x's then those get quitely filled in at config_network_hwaddr. If that happens then we want to save the autogenerated hwaddr in the unexpanded config so that when we write it to disk, it is saved. This patch dumbly re-generates the network configuration in the unexp configuration every time we load a config file, just as we do after every clone. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

load_config_locked: update unexp network
d08779d4 · Serge Hallyn · Stéphane Graber · 2eef2bda · d08779d4
Commit d08779d4 authored Aug 22, 2014 by Serge Hallyn Committed by Stéphane Graber Aug 22, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

lxccontainer.c src/lxc/lxccontainer.c +5 -3

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -412,9 +412,11 @@ static bool load_config_locked(struct lxc_container *c, const char *fname)
 		c->lxc_conf = lxc_conf_init();
 	if (!c->lxc_conf)
 		return false;
-	if (!lxc_config_read(fname, c->lxc_conf, false))
+	if (lxc_config_read(fname, c->lxc_conf, false) != 0)
-		return true;
+		return false;
-	return false;
+	if (!clone_update_unexp_network(c->lxc_conf))
+		return false;
+	return true;
 }
 static bool lxcapi_load_config(struct lxc_container *c, const char *alt_file)