Merge pull request #872 from clopez/lxc-devsetup-sysvinit-upstart

config/init/common/Makefile.am

 EXTRA_DIST = lxc-containers.in lxc-net.in
-pkglibexec_SCRIPTS = lxc-containers lxc-net
+pkglibexec_SCRIPTS = lxc-containers lxc-net lxc-devsetup

config/init/systemd/Makefile.am

 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

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
 }
 

config/init/upstart/lxc.conf → 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" ]

configure.ac

@@ -651,6 +651,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