[lxc-devel] [lxc/lxc] 25070b: lxc-stop: don't set timeout if user requested -s

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 25070b660187b61aa4e969db01b55d1360639543
      https://github.com/lxc/lxc/commit/25070b660187b61aa4e969db01b55d1360639543
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2013-12-23 (Mon, 23 Dec 2013)

  Changed paths:
    M doc/lxc-stop.sgml.in
    M src/lxc/lxc_stop.c

  Log Message:
  -----------
  lxc-stop: don't set timeout if user requested -s

A timeout means wait this long before killing the container.
-s means don't kill the container.  timeout defaults to 60
seconds.  So if a shutdown is requested, then set timeout to
0.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>