Commit de2b7e65 by Cameron Norman

Add instanced systemd service

parent dc80aa9c
...@@ -2,17 +2,19 @@ EXTRA_DIST = \ ...@@ -2,17 +2,19 @@ EXTRA_DIST = \
lxc-devsetup \ lxc-devsetup \
lxc-apparmor-load \ lxc-apparmor-load \
lxc.service.in \ lxc.service.in \
lxc@.service.in \
lxc-net.service.in lxc-net.service.in
if INIT_SCRIPT_SYSTEMD 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) $(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: 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@.service
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc-net.service rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxc-net.service
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
......
[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
...@@ -625,6 +625,7 @@ AC_CONFIG_FILES([ ...@@ -625,6 +625,7 @@ AC_CONFIG_FILES([
config/init/common/lxc-net config/init/common/lxc-net
config/init/systemd/Makefile config/init/systemd/Makefile
config/init/systemd/lxc.service config/init/systemd/lxc.service
config/init/systemd/lxc@.service
config/init/systemd/lxc-net.service config/init/systemd/lxc-net.service
config/init/sysvinit/Makefile config/init/sysvinit/Makefile
config/init/sysvinit/lxc-containers config/init/sysvinit/lxc-containers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment