Define LXC_DEFAULT_CONFIG

And use it in place of the various ways we were deducing /etc/lxc/default.conf.

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

diff --git a/configure.ac b/configure.ac
index 65751ce3c6af5b173a7f5f140a7598a39ba44e5d..456700185788ac6478010a5d5c0061b2c81fff93 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -218,6 +218,7 @@ AS_AC_EXPAND(BINDIR, "$bindir")
 AS_AC_EXPAND(LIBEXECDIR, "$libexecdir")
 AS_AC_EXPAND(INCLUDEDIR, "$includedir")
 AS_AC_EXPAND(SYSCONFDIR, "$sysconfdir")
+AS_AC_EXPAND(LXC_DEFAULT_CONFIG, "$sysconfdir/lxc/default.conf")
 AS_AC_EXPAND(DATADIR, "$datadir")
 AS_AC_EXPAND(LOCALSTATEDIR, "$localstatedir")
 AS_AC_EXPAND(DOCDIR, "$docdir")

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 70fcd257c3a2079ac927387dde77b97dbc89de2e..18469a1c48c08a7a4ae266e8c46f1576291fa80f 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -94,7 +94,8 @@ AM_CFLAGS=-I$(top_srcdir)/src \
        -DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
        -DLXCINITDIR=\"$(LXCINITDIR)\" \
        -DLXCTEMPLATEDIR=\"$(LXCTEMPLATEDIR)\" \
-       -DLOGPATH=\"$(LOGPATH)\"
+       -DLOGPATH=\"$(LOGPATH)\" \
+       -DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\"
 
 if ENABLE_APPARMOR
 AM_CFLAGS += -DHAVE_APPARMOR

diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
index 261360430451fdff34f61e51abcf8ead861ba537..9176d1f68b3bf64f99387519e6de444c70969a49 100644 (file)
--- a/src/lxc/lxc_create.c
+++ b/src/lxc/lxc_create.c
@@ -135,8 +135,6 @@ bool validate_bdev_args(struct lxc_arguments *a)
        return true;
 }
 
-/* grab this through autoconf from @config-path@ ? */
-#define DEFAULT_CONFIG "/etc/lxc/default.conf"
 int main(int argc, char *argv[])
 {
        struct lxc_container *c;
@@ -174,7 +172,7 @@ int main(int argc, char *argv[])
        if (my_args.configfile)
                c->load_config(c, my_args.configfile);
        else
-               c->load_config(c, DEFAULT_CONFIG);
+               c->load_config(c, LXC_DEFAULT_CONFIG);
 
        if (strcmp(my_args.bdevtype, "zfs") == 0) {
                if (my_args.zfsroot)

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 24b6008c29cbbdb051694d2f8bac897f881b4c2c..61e1327cd59b756f4df308a43cdca75afbf62c66 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1158,9 +1158,6 @@ static int lxcapi_get_keys(struct lxc_container *c, const char *key, char *retv,
        return ret;
 }
 
-
-/* default config file - should probably come through autoconf */
-#define LXC_DEFAULT_CONFIG "/etc/lxc/default.conf"
 static bool lxcapi_save_config(struct lxc_container *c, const char *alt_file)
 {
        FILE *fout;

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index ba24d2c7a0044bbc55493891979c4fb768f309aa..be036e3fa2ed0ae1a61d27f6459648f47899beb2 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -20,7 +20,8 @@ AM_CFLAGS=-I$(top_srcdir)/src \
        -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
        -DLXCPATH=\"$(LXCPATH)\" \
        -DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
-       -DLXCINITDIR=\"$(LXCINITDIR)\"
+       -DLXCINITDIR=\"$(LXCINITDIR)\" \
+       -DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\"
 
 bin_PROGRAMS = lxc-test-containertests lxc-test-locktests lxc-test-startone \
        lxc-test-destroytest lxc-test-saveconfig lxc-test-createtest \

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

diff --git a/src/tests/destroytest.c b/src/tests/destroytest.c
index 0552b4c05ce299668f1dfcd1777285ad8c833784..428d09ef1d30532c3116758c79f8a16a263ddb8f 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", "/etc/lxc/default.conf", "-n", MYNAME, NULL);
+               ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-f", LXC_DEFAULT_CONFIG, "-n", MYNAME, NULL);
                // Should not return
                perror("execl");
                exit(1);

diff --git a/src/tests/saveconfig.c b/src/tests/saveconfig.c
index fa84e32140d38161e213369a81a74850b2d3b8b8..649573f606f814b8971f328ed053162d2e3c21ad 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", "/etc/lxc/default.conf", "-n", MYNAME, NULL);
+               ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-f", LXC_DEFAULT_CONFIG, "-n", MYNAME, NULL);
                // Should not return
                perror("execl");
                exit(1);

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