]> git.ipfire.org Git - thirdparty/lxc.git/commit
Logging: don't confuse command line and config file specified values
authorSerge Hallyn <serge.hallyn@ubuntu.com>
Tue, 6 Aug 2013 19:56:48 +0000 (14:56 -0500)
committerSerge Hallyn <serge.hallyn@ubuntu.com>
Wed, 7 Aug 2013 13:55:37 +0000 (08:55 -0500)
commitb40a606e52c788db85fe1c42d3747483d159b6a5
tree8a1973543e86501a096a55ef14cb9523cc4e8fde
parent96532523ef90ea6ce3f08ec7d74c3c850b885e50
Logging: don't confuse command line and config file specified values

Currently if loglevel/logfile are specified on command line in a
program using LXC api, and that program does any
container->save_config(), then the new config will be saved with the
loglevel/logfile specified on command line.  This is wrong, especially
in the case of

cat > lxc.conf << EOF
lxc.logfile=a
EOF

lxc-create -t cirros -n c1 -o b

which will result in a container config with lxc.logfile=b.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
src/lxc/conf.c
src/lxc/conf.h
src/lxc/confile.c