summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-08-23 07:01:08 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-08-23 07:01:33 +0000
commited21fa9744e3645350a27c8374615ae12dcb2999 (patch)
treedc52a318eb84e15d13e7844b69c3e0c9ae148b8e
parentReleasing debian version 20190301-lts1-2. (diff)
downloadopen-infrastructure-compute-tools-ed21fa9744e3645350a27c8374615ae12dcb2999.tar.xz
open-infrastructure-compute-tools-ed21fa9744e3645350a27c8374615ae12dcb2999.zip
Merging upstream version 20190301-lts2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--CHANGELOG.txt7
-rw-r--r--VERSION.txt2
-rw-r--r--share/systemd/container@.service3
3 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 330e383..9d8b8ef 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+2019-08-23 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20190301-lts2.
+
+ [ Nik Lutz ]
+ * Fix start of container by altering the systemd service file.
+
2019-03-02 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20190301-lts1.
diff --git a/VERSION.txt b/VERSION.txt
index 7182ca9..0583a76 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20190301-lts1
+20190301-lts2
diff --git a/share/systemd/container@.service b/share/systemd/container@.service
index 9e9f720..99c4bd4 100644
--- a/share/systemd/container@.service
+++ b/share/systemd/container@.service
@@ -4,8 +4,7 @@ Documentation=man:compute-tools
[Service]
Type=simple
-ExecStart=/usr/bin/container start --name %i --nspawn --no-notification
-ExecStartPost=/usr/bin/container start --name %i --start --no-notification
+ExecStart=/usr/bin/container start --name %i --start --no-notification
ExecStopPost=/usr/bin/container stop -n %i --clean --no-notification
KillMode=mixed