Use lxc-stop -k instead of lxc-kill

[clkao]

lxc-kill was removed in lxc/lxc@33ddfc2

Docker-DCO-1.1-Signed-off-by: Chia-liang Kao clkao@clkao.org (github: clkao)

[tianon]

We still support older LXC versions, so it isn't quite as simple as this. What we need to do is look for lxc-kill (with LookPath or something similar - maybe even just try running it if that's easier), and if it isn't there, then fall back to lxc-stop -k.

[clkao]

Ok, apparently -k landed lxc-stop as of lxc/lxc@3e625e2. I suppose that's not ancient enough

[crosbymichael]

@clkao That is only tagged with 1.0.0alpha, We support lxc as far back as 0.7.5

[tianon]

Indeed, and we've actually seen the most stability out of LXC 0.8, which also does not have the option yet.

[clkao]

Right. I was testing something on trusty, which comes with1.0.0beta3. Perhaps we should make travis smoke with various lxc versions?

[vieux]

@clkao your if statement is wrong, please rename hasNoKill in err and you'll see it's inverted

[clkao]

@vieux fixed, thanks! Sorry I am having trouble with dev env to actually test this

[vieux]

LGTM

[SvenDowideit]

LGTM, thank you - (I'll make a new PR to document the issue for people that are using a pre-0.8 docker)

[SvenDowideit]

for users using docker before this fix, and with lxc versions 1.0.0.beta3 and later, you can create an lxc-kill shell script to do the same thing:

docker@boot2docker:~$ sudo echo "#!/bin/sh" > /usr/local/bin/lxc-kill
docker@boot2docker:~$ sudo echo "lxc-stop -k \$@" >> /usr/local/bin/lxc-kill
docker@boot2docker:~$ chmod +x /usr/local/bin/lxc-kill

(or wherever is reasonable in your path)

[crosbymichael]

LGTM

[felixrabe]

@SvenDowideit Careful with sudo something > /privileged-file - that won't work as you expect. Rather use something | sudo tee /privileged-file > /dev/null or whatever. (I'm sure there's a more elegant way.)