]> git.proxmox.com Git - mirror_lxc.git/commit
Add a unexpanded lxc_conf
authorSerge Hallyn <serge.hallyn@ubuntu.com>
Thu, 12 Jun 2014 14:24:38 +0000 (14:24 +0000)
committerStéphane Graber <stgraber@ubuntu.com>
Wed, 18 Jun 2014 20:56:14 +0000 (16:56 -0400)
commitf979ac15923809df97d9b7b16a1411d20f386777
tree32dc9de04bbf69f93dca7ebc26ebce4336bc4490
parent41cf1ac30de569888c70b1f1b40d29993950ff2e
Add a unexpanded lxc_conf

Currently when a container's configuration file has lxc.includes,
any future write_config() will expand the lxc.includes.  This
affects container clones (and snapshots) as well as users of the
API who make an update and then c.save_config().

To fix this, separately track the expanded and unexpanded lxc_conf.  The
unexpanded conf does not contain values read from lxc.includes.  The
expanded conf does.  Lxc functions mainly need the expanded conf to
figure out how to configure the container.  The unexpanded conf is used
at write_config().

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
src/lxc/conf.c
src/lxc/conf.h
src/lxc/confile.c
src/lxc/confile.h
src/lxc/lxc_execute.c
src/lxc/lxccontainer.c
src/lxc/lxccontainer.h