confile: config_includefile()

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

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 8af729ea5ca9063c9d41ccc4b53cb73d8f75a240..5b2e05f2852248f0915c90cd868fc06399f4889a 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2171,11 +2171,15 @@ out:
 }
 
 static int config_includefile(const char *key, const char *value,
-                         struct lxc_conf *lxc_conf)
+                             struct lxc_conf *lxc_conf)
 {
-       if (config_value_empty(value))
+       /* Set config value to default. */
+       if (config_value_empty(value)) {
+               lxc_clear_config_item(lxc_conf, key);
                return 0;
+       }
 
+       /* Parse new config value. */
        if (is_dir(value))
                return do_includedir(value, lxc_conf);