proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 03:53:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

load_config_locked: update unexp network

Browse Source 
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>
This commit is contained in:
Serge Hallyn 2014-08-22 04:45:18 +00:00 committed by Stéphane Graber
parent 2eef2bda81
commit d08779d49d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lxc/lxccontainer.c
View File

@ -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))
return true;
return false;
if (lxc_config_read(fname, c->lxc_conf, false) != 0)
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)