Execute script lxc-devsetup also with sysvinit and upstart.

  * This script sets /dev/.lxc which is needed for autodev containers.
  * Previously was only executed with systemd. Execute it also with
    the other init systems (sysvinit and upstart)

Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com>

diff --git a/config/init/common/Makefile.am b/config/init/common/Makefile.am
index 8c0134c7a54eea0b916e43d87265eb6f97239ef6..6d1a07709ad4b8ffc0cd668c190d1d2bc2adf55b 100644 (file)
--- a/config/init/common/Makefile.am
+++ b/config/init/common/Makefile.am
@@ -1,2 +1,2 @@
 EXTRA_DIST = lxc-containers.in lxc-net.in
-pkglibexec_SCRIPTS = lxc-containers lxc-net
+pkglibexec_SCRIPTS = lxc-containers lxc-net lxc-devsetup

diff --git a/config/init/systemd/lxc-devsetup b/config/init/common/lxc-devsetup
similarity index 100%
rename from config/init/systemd/lxc-devsetup
rename to config/init/common/lxc-devsetup

diff --git a/config/init/systemd/Makefile.am b/config/init/systemd/Makefile.am
index d0f8205f753f220ee3fdd4ede0de11ce711295c7..c448850d1b1b487a11ed4f0ce0b9bd82d4e5521a 100644 (file)
--- a/config/init/systemd/Makefile.am
+++ b/config/init/systemd/Makefile.am
@@ -1,5 +1,4 @@
 EXTRA_DIST = \
-       lxc-devsetup \
        lxc-apparmor-load \
        lxc.service.in \
        lxc@.service.in \
@@ -8,7 +7,7 @@ EXTRA_DIST = \
 if INIT_SCRIPT_SYSTEMD
 BUILT_SOURCES = lxc.service lxc@.service lxc-net.service
 
-install-systemd: lxc.service lxc@.service lxc-net.service lxc-devsetup lxc-apparmor-load
+install-systemd: lxc.service lxc@.service lxc-net.service lxc-apparmor-load
        $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
        $(INSTALL_DATA) lxc.service lxc@.service lxc-net.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
 
@@ -18,7 +17,7 @@ uninstall-systemd:
        rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc-net.service
        rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
 
-pkglibexec_SCRIPTS = lxc-devsetup lxc-apparmor-load
+pkglibexec_SCRIPTS = lxc-apparmor-load
 
 install-data-local: install-systemd
 uninstall-local: uninstall-systemd

diff --git a/config/init/sysvinit/lxc-containers.in b/config/init/sysvinit/lxc-containers.in
index bc93322a41ab18be0212eee00007c0362c926114..7a55c3b4a148aea820d17e9ef5cdc59550e96381 100644 (file)
--- a/config/init/sysvinit/lxc-containers.in
+++ b/config/init/sysvinit/lxc-containers.in
@@ -30,6 +30,8 @@ if ! type action >/dev/null 2>&1; then
 fi
 
 start() {
+    # Setup host /dev for autodev containers.
+    @LIBEXECDIR@/lxc/lxc-devsetup
     action $"Starting LXC autoboot containers: " @LIBEXECDIR@/lxc/lxc-containers start
 }
 

diff --git a/config/init/upstart/lxc.conf b/config/init/upstart/lxc.conf.in
similarity index 96%
rename from config/init/upstart/lxc.conf
rename to config/init/upstart/lxc.conf.in
index 437db3ce5f1df3b46d5e264c96a3898baba93c3c..899fe11058cf072cd2bc7041c44b9ec84c492b77 100644 (file)
--- a/config/init/upstart/lxc.conf
+++ b/config/init/upstart/lxc.conf.in
@@ -45,6 +45,9 @@ pre-start script
                fi
        fi
 
+       # Setup host /dev for autodev containers.
+       @LIBEXECDIR@/lxc/lxc-devsetup
+
        [ "x$LXC_AUTO" = "xtrue" ] || exit 0
 
        if [ -n "$BOOTGROUPS" ]

diff --git a/configure.ac b/configure.ac
index 47564931145b7dabdc48facaaca40627493d296f..84e24ebbc74396a0038aaec13589b4e33ac243ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -650,6 +650,7 @@ AC_CONFIG_FILES([
        config/init/sysvinit/Makefile
        config/init/sysvinit/lxc-containers
        config/init/sysvinit/lxc-net
+       config/init/upstart/lxc.conf
        config/init/upstart/lxc-net.conf
        config/init/upstart/Makefile
        config/etc/Makefile