From: JD Friedrikson <yours@decompo.site>
Date: Wed, 31 May 2017 16:41:41 +0000 (-0400)
Subject: Use lxc-stop to stop systemd service
X-Git-Tag: lxc-2.1.0~112^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1605%2Fhead;p=thirdparty%2Flxc.git

Use lxc-stop to stop systemd service

Ever since 8eb62c2, systemd has not been able to cleanly stop lxc
containers (via lxc@) because it's still using SIGPWR for systemd-based
containers.

We should now use the nice logic in 330ae3d to stop the containers
instead.

Signed-off-by: JD Friedrikson <yours@decompo.site>
---

diff --git a/config/init/systemd/lxc@.service.in b/config/init/systemd/lxc@.service.in
index 44d11e8ec..a2aa2211f 100644
--- a/config/init/systemd/lxc@.service.in
+++ b/config/init/systemd/lxc@.service.in
@@ -8,9 +8,9 @@ Documentation=man:lxc-start man:lxc
 [Service]
 Type=simple
 KillMode=mixed
-KillSignal=SIGPWR
 TimeoutStopSec=120s
 ExecStart=@BINDIR@/lxc-start -F -n %i
+ExecStop=@BINDIR@/lxc-stop -n %i
 # Environment=BOOTUP=serial
 # Environment=CONSOLETYPE=serial
 Delegate=yes