Signed-off-by: Dwight Engen <dwight.en...@oracle.com>
---
config/Makefile.am | 14 +++++++-------
config/default.conf.libvirt | 3 +++
config/default.conf.ubuntu | 3 +++
config/default.conf.unknown | 1 +
config/lxc.conf.libvirt | 3 ---
config/lxc.conf.ubuntu | 3 ---
config/lxc.conf.unknown | 1 -
configure.ac | 8 ++++----
src/lxc/lxc-create.in | 2 +-
src/lxc/lxccontainer.c | 2 +-
src/tests/containertests.c | 2 +-
src/tests/destroytest.c | 2 +-
src/tests/saveconfig.c | 2 +-
src/tests/startone.c | 2 +-
14 files changed, 24 insertions(+), 24 deletions(-)
create mode 100644 config/default.conf.libvirt
create mode 100644 config/default.conf.ubuntu
create mode 100644 config/default.conf.unknown
delete mode 100644 config/lxc.conf.libvirt
delete mode 100644 config/lxc.conf.ubuntu
delete mode 100644 config/lxc.conf.unknown
diff --git a/config/Makefile.am b/config/Makefile.am
index 1611b7d..47f2750 100644
--- 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/default.conf.libvirt b/config/default.conf.libvirt
new file mode 100644
index 0000000..6950dca
--- /dev/null
+++ b/config/default.conf.libvirt
@@ -0,0 +1,3 @@
+lxc.network.type = veth
+lxc.network.link = virbr0
+lxc.network.flags = up
diff --git a/config/default.conf.ubuntu b/config/default.conf.ubuntu
new file mode 100644
index 0000000..0a5ac71
--- /dev/null
+++ b/config/default.conf.ubuntu
@@ -0,0 +1,3 @@
+lxc.network.type = veth
+lxc.network.link = lxcbr0
+lxc.network.flags = up
diff --git a/config/default.conf.unknown b/config/default.conf.unknown
new file mode 100644
index 0000000..6c88010
--- /dev/null
+++ b/config/default.conf.unknown
@@ -0,0 +1 @@
+lxc.network.type = empty
diff --git a/config/lxc.conf.libvirt b/config/lxc.conf.libvirt
deleted file mode 100644
index 6950dca..0000000
--- a/config/lxc.conf.libvirt
+++ /dev/null
@@ -1,3 +0,0 @@
-lxc.network.type = veth
-lxc.network.link = virbr0
-lxc.network.flags = up
diff --git a/config/lxc.conf.ubuntu b/config/lxc.conf.ubuntu
deleted file mode 100644
index 0a5ac71..0000000
--- a/config/lxc.conf.ubuntu
+++ /dev/null
@@ -1,3 +0,0 @@
-lxc.network.type = veth
-lxc.network.link = lxcbr0
-lxc.network.flags = up
diff --git a/config/lxc.conf.unknown b/config/lxc.conf.unknown
deleted file mode 100644
index 6c88010..0000000
--- a/config/lxc.conf.unknown
+++ /dev/null
@@ -1 +0,0 @@
-lxc.network.type = empty
diff --git a/configure.ac b/configure.ac
index 359f28d..d7ecd04 100644
--- 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 9348d87..cfb3323 100644
--- 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 502a7a7..9d491fc 100644
--- 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 3ac0fc5..d68f17c 100644
--- 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 3fe35df..28f0577 100644
--- 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 21450b2..bbaea19 100644
--- 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 325942e..f76ed1e 100644
--- 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);
--
1.7.12.3
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
