Drop usage of LXC_DEFAULT_CONFIG in our code

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
index 42eb8d9023b3d444fcab7f331a6e21db6bc9d257..d02daccebf7a2c8d12d1ff92ad8dd75acc4df3fe 100644 (file)
--- a/src/lxc/lxc_create.c
+++ b/src/lxc/lxc_create.c
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
        if (my_args.configfile)
                c->load_config(c, my_args.configfile);
        else
-               c->load_config(c, LXC_DEFAULT_CONFIG);
+               c->load_config(c, lxc_global_config_value("lxc.default_config"));
 
        if (my_args.fstype)
                spec.fstype = my_args.fstype;

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index faa0a9fde5f6fa12529a595c010865b68d0f99bc..48fef74f84ada7f0765dcec455c2b4b3cd5b5477 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1186,8 +1186,8 @@ static bool lxcapi_create(struct lxc_container *c, const char *t,
        }
 
        if (!c->lxc_conf) {
-               if (!c->load_config(c, LXC_DEFAULT_CONFIG)) {
-                       ERROR("Error loading default configuration file %s\n", LXC_DEFAULT_CONFIG);
+               if (!c->load_config(c, lxc_global_config_value("lxc.default_config"))) {
+                       ERROR("Error loading default configuration file %s\n", lxc_global_config_value("lxc.default_config"));
                        goto free_tpath;
                }
        }
@@ -1658,8 +1658,8 @@ static bool lxcapi_save_config(struct lxc_container *c, const char *alt_file)
 
        // If we haven't yet loaded a config, load the stock config
        if (!c->lxc_conf) {
-               if (!c->load_config(c, LXC_DEFAULT_CONFIG)) {
-                       ERROR("Error loading default configuration file %s while saving %s\n", LXC_DEFAULT_CONFIG, c->name);
+               if (!c->load_config(c, lxc_global_config_value("lxc.default_config"))) {
+                       ERROR("Error loading default configuration file %s while saving %s\n", lxc_global_config_value("lxc.default_config"), c->name);
                        return false;
                }
        }

diff --git a/src/tests/containertests.c b/src/tests/containertests.c
index d3742e78cd670a03895bae3c5755e7852e041da4..aaf29e56ea215564d9fe9363dbd5981f5da1b6c7 100644 (file)
--- a/src/tests/containertests.c
+++ b/src/tests/containertests.c
@@ -72,7 +72,7 @@ static int create_busybox(void)
                return -1;
        }
        if (pid == 0) {
-               ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-f", LXC_DEFAULT_CONFIG, "-n", MYNAME, NULL);
+               ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
                // Should not return
                perror("execl");
                exit(1);

diff --git a/src/tests/destroytest.c b/src/tests/destroytest.c
index 6403472f32713f28ccf5c0903787913fdd91486f..4d051192cbf62cdb6f283b1e6051534b89e6df1c 100644 (file)
--- a/src/tests/destroytest.c
+++ b/src/tests/destroytest.c
@@ -38,7 +38,7 @@ static int create_ubuntu(void)
                return -1;
        }
        if (pid == 0) {
-               ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-f", LXC_DEFAULT_CONFIG, "-n", MYNAME, NULL);
+               ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-n", MYNAME, NULL);
                // Should not return
                perror("execl");
                exit(1);

diff --git a/src/tests/saveconfig.c b/src/tests/saveconfig.c
index a6eae650ad381f67108b35a05aaa2cff9fa624f5..a455294ef0277e9493a036e22d947330716e24c4 100644 (file)
--- a/src/tests/saveconfig.c
+++ b/src/tests/saveconfig.c
@@ -38,7 +38,7 @@ static int create_ubuntu(void)
                return -1;
        }
        if (pid == 0) {
-               ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-f", LXC_DEFAULT_CONFIG, "-n", MYNAME, NULL);
+               ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-n", MYNAME, NULL);
                // Should not return
                perror("execl");
                exit(1);

diff --git a/src/tests/startone.c b/src/tests/startone.c
index 08587eacebe886e18feddbde28ecef889114443d..678f62e6b21c186ea0db9846972dbffc5a600de7 100644 (file)
--- a/src/tests/startone.c
+++ b/src/tests/startone.c
@@ -71,7 +71,7 @@ static int create_ubuntu(void)
                return -1;
        }
        if (pid == 0) {
-               ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-f", LXC_DEFAULT_CONFIG, "-n", MYNAME, NULL);
+               ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-n", MYNAME, NULL);
                // Should not return
                perror("execl");
                exit(1);