From ed21fa9744e3645350a27c8374615ae12dcb2999 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 23 Aug 2019 09:01:08 +0200 Subject: Merging upstream version 20190301-lts2. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 7 +++++++ VERSION.txt | 2 +- share/systemd/container@.service | 3 +-- 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 + + * Releasing version 20190301-lts2. + + [ Nik Lutz ] + * Fix start of container by altering the systemd service file. + 2019-03-02 Daniel Baumann * 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 -- cgit v1.2.3