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>

lxc-stop: don't set timeout if user requested -s
25070b66 · Serge Hallyn · 4878dac4 · 25070b66 · 25070b66
Commit 25070b66 authored Dec 23, 2013 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

lxc-stop.sgml.in doc/lxc-stop.sgml.in +1 -2

lxc_stop.c src/lxc/lxc_stop.c +3 -0

No files found.
--- 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>

--- 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)