]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Use lxc-stop to stop systemd service 1605/head
authorJD Friedrikson <yours@decompo.site>
Wed, 31 May 2017 16:41:41 +0000 (12:41 -0400)
committerJD Friedrikson <yours@decompo.site>
Wed, 31 May 2017 22:04:37 +0000 (18:04 -0400)
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>
config/init/systemd/lxc@.service.in

index 44d11e8ec8f5ee89a221c447e8fc179abd9000ed..a2aa2211f0f9649d257b7205966c207562c0e590 100644 (file)
@@ -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