proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-06-04 12:15:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure/makefile: rename default_conf to distro_conf

Browse Source 
configure/makefile: rename default_conf to distro_conf, since it is a per-distro
default.  Then we'll be able to use the symbol LXC_DEFAULT_CONF in the code to
refer to the installed file.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Serge Hallyn 2013-05-31 16:02:33 +02:00
parent 3bc449ed24
commit 3a647d582d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/Makefile.am
View File

@ -1,11 +1,11 @@
configdir = $(sysconfdir)/lxc
config_DATA = default.conf
defaultconf = @LXC_DEFAULT_CONF@
distroconf = @LXC_DISTRO_CONF@
EXTRA_DIST = default.conf.ubuntu default.conf.libvirt default.conf.unknown
default.conf:
cp $(defaultconf) $@
cp $(distroconf) $@
clean-local:
@$(RM) -f default.conf

8
configure.ac
View File

@ -39,14 +39,14 @@ if test "z$with_distro" = "z"; then
fi
case $with_distro in
ubuntu)
defaultconf=default.conf.ubuntu
distroconf=default.conf.ubuntu
;;
redhat|fedora|oracle|oracleserver)
defaultconf=default.conf.libvirt
distroconf=default.conf.libvirt
;;
*)
echo -n "Linux distribution network config unknown, defaulting to lxc.network.type = empty"
defaultconf=default.conf.unknown
distroconf=default.conf.unknown
;;
esac
AC_MSG_RESULT([$with_distro])
@ -221,7 +221,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_DEFAULT_CONF, "$defaultconf")
AS_AC_EXPAND(LXC_DISTRO_CONF, "$distroconf")
AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
AS_AC_EXPAND(LXCPATH, "$with_config_path")
AS_AC_EXPAND(LXC_GLOBAL_CONF, "$with_global_conf")