[lxc-devel] [lxc/lxc] dc0682: init: Add upstart jobs and some more changes (v3)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: dc0682900a79cfb47fd9a416902129bfa68fdcbf
      https://github.com/lxc/lxc/commit/dc0682900a79cfb47fd9a416902129bfa68fdcbf
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2014-01-16 (Thu, 16 Jan 2014)

  Changed paths:
    M config/Makefile.am
    A config/init/Makefile.am
    A config/init/systemd/Makefile.am
    A config/init/systemd/lxc-devsetup
    A config/init/systemd/lxc.service
    A config/init/sysvinit/Makefile.am
    A config/init/sysvinit/lxc
    A config/init/upstart/Makefile.am
    A config/init/upstart/lxc-instance.conf
    A config/init/upstart/lxc-net.conf
    A config/init/upstart/lxc.conf
    M configure.ac
    M lxc.spec.in
    M src/lxc/Makefile.am
    R src/lxc/lxc-devsetup
    R src/lxc/lxc.service
    R src/lxc/lxc.sysvinit

  Log Message:
  -----------
  init: Add upstart jobs and some more changes (v3)

This adds the 3 upstart jobs that we've had in Ubuntu for a while:
 - lxc.conf: Main upstart job, triggers lxc-net.conf based on config
 - lxc-instance.conf: Triggered by lxc.conf for each auto-started container
 - lxc-net.conf: Triggered by lxc.conf, sets up lxcbr0, NAT, mangling, ...

In addition, there are two extra config files in /etc/default:
 - lxc: Allows setting some values like http proxying, disabling autostart, ...
 - lxc-net: Network configuration for the lxcbr0 bridge

This change also disables the sysv script for all distros but Oracle as
the current script won't work on either Ubuntu nor Debian and I suspect
quite a few more distros, so it's not nearly as distro-agnostic as we
thought.

For Debian, only install the upstart jobs and systemd unit.
For Ubuntu, only install the upstart jobs.

This change also moves all the init related stuff to config/init/

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