Rename /etc/lxc/lxc.conf to /etc/lxc/default.conf.

This will soon be followed by the introduction of a "real" system wide
/etc/lxc/lxc.conf storing global LXC settings.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/config/Makefile.am b/config/Makefile.am
index 1611b7d7764ee02277cd6fa326abd8d303cb3cf6..47f27505e49bb27845663f2d26ce1cbc99675650 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,15 +1,15 @@
 configdir = $(sysconfdir)/lxc
-config_DATA = lxc.conf
-conffile = @LXC_CONFFILE@
+config_DATA = default.conf
+defaultconf = @LXC_DEFAULT_CONF@
 
-EXTRA_DIST = lxc.conf.ubuntu lxc.conf.libvirt lxc.conf.unknown
+EXTRA_DIST = default.conf.ubuntu default.conf.libvirt default.conf.unknown
 
-lxc.conf:
-       cp $(conffile) $@
+default.conf:
+       cp $(defaultconf) $@
 
 clean-local:
-       @$(RM) -f lxc.conf
+       @$(RM) -f default.conf
 
 distclean-local:
-       @$(RM) -f lxc.conf
+       @$(RM) -f default.conf
        @$(RM) -f compile config.guess config.sub depcomp install-sh ltmain.sh missing Makefile.in Makefile

diff --git a/config/lxc.conf.libvirt b/config/default.conf.libvirt
similarity index 100%
rename from config/lxc.conf.libvirt
rename to config/default.conf.libvirt

diff --git a/config/lxc.conf.ubuntu b/config/default.conf.ubuntu
similarity index 100%
rename from config/lxc.conf.ubuntu
rename to config/default.conf.ubuntu

diff --git a/config/lxc.conf.unknown b/config/default.conf.unknown
similarity index 100%
rename from config/lxc.conf.unknown
rename to config/default.conf.unknown

diff --git a/configure.ac b/configure.ac
index 359f28de4677c04167ae4773d24123880a021278..d7ecd04878a4175c7375fd9b68ccebf091898ca9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,14 +39,14 @@ if test "z$with_distro" = "z"; then
 fi
 case $with_distro in
        ubuntu)
-               conffile=lxc.conf.ubuntu
+               defaultconf=default.conf.ubuntu
                ;;
        redhat|fedora|oracle|oracleserver)
-               conffile=lxc.conf.libvirt
+               defaultconf=default.conf.libvirt
                ;;
        *)
                echo -n "Linux distribution network config unknown, defaulting to lxc.network.type = empty"
-               conffile=lxc.conf.unknown
+               defaultconf=default.conf.unknown
                ;;
 esac
 AC_MSG_RESULT([$with_distro])
@@ -204,7 +204,7 @@ AS_AC_EXPAND(SYSCONFDIR, "$sysconfdir")
 AS_AC_EXPAND(DATADIR, "$datadir")
 AS_AC_EXPAND(LOCALSTATEDIR, "$localstatedir")
 AS_AC_EXPAND(DOCDIR, "$docdir")
-AS_AC_EXPAND(LXC_CONFFILE, "$conffile")
+AS_AC_EXPAND(LXC_DEFAULT_CONF, "$defaultconf")
 AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
 AS_AC_EXPAND(LXCPATH, "$with_config_path")
 AS_AC_EXPAND(LXCROOTFSMOUNT, "$with_rootfs_path")

diff --git a/src/lxc/lxc-create.in b/src/lxc/lxc-create.in
index 9348d87e4a10354f450736c0b1ebf7b8d66810a5..cfb332360970ea80f1b396fc547af27881bf2628 100644 (file)
--- a/src/lxc/lxc-create.in
+++ b/src/lxc/lxc-create.in
@@ -274,7 +274,7 @@ trap cleanup HUP INT TERM
 mkdir -p $lxc_path/$lxc_name
 
 if [ -z "$lxc_config" ]; then
-    lxc_config="@SYSCONFDIR@/lxc/lxc.conf"
+    lxc_config="@SYSCONFDIR@/lxc/default.conf"
     echo
     echo "$(basename $0): No config file specified, using the default config $lxc_config"
 fi

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 502a7a73af0e80ab525eb84013db974002d9cd69..9d491fcda027b6d31d6a29bd1440fd01416ff639 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -762,7 +762,7 @@ static int lxcapi_get_keys(struct lxc_container *c, const char *key, char *retv,
 
 
 /* default config file - should probably come through autoconf */
-#define LXC_DEFAULT_CONFIG "/etc/lxc/lxc.conf"
+#define LXC_DEFAULT_CONFIG "/etc/lxc/default.conf"
 static bool lxcapi_save_config(struct lxc_container *c, const char *alt_file)
 {
        if (!alt_file)

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

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

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

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