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@ubuntu.com>

diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in
index d4ec36a177719133bcb34b798b02e41535d9da97..09ea5d6be022a534dc6a97a3dcfdc9c20c68aa8b 100644 (file)
--- a/doc/lxc-stop.sgml.in
+++ b/doc/lxc-stop.sgml.in
@@ -151,8 +151,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
        </term>
        <listitem>
          <para>
-           Wait TIMEOUT seconds before hard-stopping the container of (in
-               the reboot case) returning failure.
+           Wait TIMEOUT seconds before hard-stopping the container.
          </para>
        </listitem>
        </varlistentry>

diff --git a/src/lxc/lxc_stop.c b/src/lxc/lxc_stop.c
index a4ead815b9dd78fa39a82f02d10ad1f859158751..7940053f25db9b5fa336f2e05c0db382aaaff21f 100644 (file)
--- a/src/lxc/lxc_stop.c
+++ b/src/lxc/lxc_stop.c
@@ -175,6 +175,9 @@ int main(int argc, char *argv[])
                goto out;
        }
 
+       if (my_args.shutdown)
+               my_args.timeout = 0;
+
        s = c->shutdown(c, my_args.timeout);
        if (!s) {
                if (!my_args.shutdown)