Merge pull request #577 from CameronNemo/systemd-instanced

config/init/systemd/Makefile.am

@@ -2,17 +2,19 @@ EXTRA_DIST = \
 	lxc-devsetup \
 	lxc-apparmor-load \
 	lxc.service.in \
+	lxc@.service.in \
 	lxc-net.service.in
 
 if INIT_SCRIPT_SYSTEMD
-BUILT_SOURCES = lxc.service lxc-net.service
+BUILT_SOURCES = lxc.service lxc@.service lxc-net.service
 
-install-systemd: lxc.service lxc-net.service lxc-devsetup lxc-apparmor-load
+install-systemd: lxc.service lxc@.service lxc-net.service lxc-devsetup lxc-apparmor-load
 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
-	$(INSTALL_DATA) lxc.service lxc-net.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
+	$(INSTALL_DATA) lxc.service lxc@.service lxc-net.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
 
 uninstall-systemd:
 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc.service
+	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc@.service
 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc-net.service
 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
 

config/init/systemd/lxc@.service.in

+[Unit]
+Description=LXC Container: %i
+# This pulls in apparmor, dev-setup, lxc-net
+After=lxc.service
+Wants=lxc.service
+
+[Service]
+Type=simple
+KillMode=mixed
+KillSignal=SIGPWR
+TimeoutStopSec=120s
+ExecStart=@BINDIR@/lxc-start -n %i
+# Environment=BOOTUP=serial
+# Environment=CONSOLETYPE=serial
+Delegate=yes
+StandardOutput=syslog
+StandardError=syslog
+
+[Install]
+WantedBy=multi-user.target

configure.ac

@@ -625,6 +625,7 @@ AC_CONFIG_FILES([
 	config/init/common/lxc-net
 	config/init/systemd/Makefile
 	config/init/systemd/lxc.service
+	config/init/systemd/lxc@.service
 	config/init/systemd/lxc-net.service
 	config/init/sysvinit/Makefile
 	config/init/sysvinit/lxc-containers