]> git.proxmox.com Git - mirror_lxc.git/commit - configure.ac
Rework init scripts
authorMichael H. Warfield <mhw@WittsEnd.com>
Mon, 25 Aug 2014 19:00:46 +0000 (15:00 -0400)
committerStéphane Graber <stgraber@ubuntu.com>
Fri, 26 Sep 2014 14:55:11 +0000 (10:55 -0400)
commit0af993195cbd57cff700c7c90ee8f95c2a1ef8aa
tree8287f248773963abc0db5563486e3dfd51d74917
parenta1dd59de3564c40b82b336b260782bc048c0a67e
Rework init scripts

This commit is based on the work of:
Signed-off-by: Michael H. Warfield <mhw@WittsEnd.com>
A generic changelog would be:
 - Bring support for lxcbr0 to all distributions
 - Share the container startup and network configuration logic across
   distributions and init systems.
 - Have all the init scripts call the helper script.
 - Support for the various different distro-specific configuration
   locations to configure lxc-net and container startup.

Changes on top of Mike's original version:
 - Remove sysconfig/lxc-net as it's apparently only there as a
   workaround for an RPM limitation and is breaking Debian systems by
   including a useless file which will get registered as a package provided
   conffile in the dpkg database and will therefore cause conffile prompts
   on upgrades...
 - Go with a consistant coding style in the various init scripts.
 - Split out the common logic from the sysvinit scripts and ship both in
   their respective location rather than have them be copies.
 - Fix the upstart jobs so they actually work (there's no such thing as
   libexec on Debian systems).

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
24 files changed:
config/Makefile.am
config/etc/Makefile.am
config/etc/default.conf.lxcbr [new file with mode: 0644]
config/etc/default.conf.ubuntu [deleted file]
config/init/Makefile.am
config/init/common/Makefile.am [new file with mode: 0644]
config/init/common/lxc-containers.in [new file with mode: 0644]
config/init/common/lxc-net.in [new file with mode: 0644]
config/init/systemd/Makefile.am
config/init/systemd/lxc-net.service.in
config/init/systemd/lxc.service.in
config/init/sysvinit/Makefile.am
config/init/sysvinit/lxc-containers.in [new file with mode: 0644]
config/init/sysvinit/lxc-net.in [new file with mode: 0644]
config/init/sysvinit/lxc.in [deleted file]
config/init/upstart/Makefile.am
config/init/upstart/lxc-net.conf [deleted file]
config/init/upstart/lxc-net.conf.in [new file with mode: 0644]
config/sysconfig/Makefile.am [new file with mode: 0644]
config/sysconfig/lxc.in [new file with mode: 0644]
configure.ac
lxc.spec.in
src/lxc/Makefile.am
src/lxc/lxc.net [deleted file]