Add instanced systemd service

Signed-off-by: Cameron Norman <camerontnorman@gmail.com>

diff --git a/config/init/systemd/Makefile.am b/config/init/systemd/Makefile.am
index 4201d98a73416e0b28ed1b2bf203c57d2203effa..d0f8205f753f220ee3fdd4ede0de11ce711295c7 100644 (file)
--- a/config/init/systemd/Makefile.am
+++ b/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) || :
 

diff --git a/config/init/systemd/lxc@.service.in b/config/init/systemd/lxc@.service.in
new file mode 100644 (file)
index 0000000..190280e
--- /dev/null
+++ b/config/init/systemd/lxc@.service.in
@@ -0,0 +1,20 @@
+[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

diff --git a/configure.ac b/configure.ac
index 51b99e38981c34b772bca49bb4ca0712b1b5f964..5e9538e4706be321007f2da821406ce79652e455 100644 (file)
--- a/configure.ac
+++ b/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