From b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Wed, 18 May 2016 20:28:46 +0200
Subject: Merging upstream version 20160515.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 share/systemd/container-auto.service      | 15 +++++++++++++++
 share/systemd/container-autostart.service | 15 ---------------
 share/systemd/container@.service          | 12 ++++++++++++
 3 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 share/systemd/container-auto.service
 delete mode 100644 share/systemd/container-autostart.service
 create mode 100644 share/systemd/container@.service

(limited to 'share/systemd')

diff --git a/share/systemd/container-auto.service b/share/systemd/container-auto.service
new file mode 100644
index 0000000..e9addd7
--- /dev/null
+++ b/share/systemd/container-auto.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=container-tools automatic start
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/container auto --start
+ExecStop=/usr/bin/container auto --stop
+Delegate=yes
+StandardOutput=syslog
+StandardError=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/share/systemd/container-autostart.service b/share/systemd/container-autostart.service
deleted file mode 100644
index 076aa41..0000000
--- a/share/systemd/container-autostart.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=container-tools automatic start
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/container-autostart
-#ExecStop=
-Delegate=yes
-StandardOutput=syslog
-StandardError=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/share/systemd/container@.service b/share/systemd/container@.service
new file mode 100644
index 0000000..0bd6766
--- /dev/null
+++ b/share/systemd/container@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description="Container: %i"
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/container start --name %i --nspawn
+ExecStartPost=/usr/bin/container start --name %i --start
+ExecStopPost=/usr/bin/container stop -n %i --clean
+KillMode=mixed
+
+[Install]
+WantedBy=multi-user.target
-- 
cgit v1.2.3