From: Carlos Alberto Lopez Perez <clopez@igalia.com>
Date: Fri, 4 Mar 2016 15:40:21 +0000 (+0100)
Subject: Execute script lxc-devsetup also with sysvinit and upstart.
X-Git-Tag: lxc-2.0.0.rc6~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F872%2Fhead;p=thirdparty%2Flxc.git

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 8c0134c7a..6d1a07709 100644
--- 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 d0f8205f7..c448850d1 100644
--- 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 bc93322a4..7a55c3b4a 100644
--- 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 437db3ce5..899fe1105 100644
--- 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 475649311..84e24ebbc 100644
--- 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