lxc-start-ephemeral: Drop stop() calls when shutdown() returns non-True

shutdown() when given a timeout already does a stop call so there's no need to check its return value and do another one. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

lxc-start-ephemeral: Drop stop() calls when shutdown() returns non-True
9737a206 · Stéphane Graber · 225b52ef · 9737a206
Commit 9737a206 authored Sep 13, 2012 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

lxc-start-ephemeral.in src/lxc/lxc-start-ephemeral.in +2 -4

No files found.
--- a/src/lxc/lxc-start-ephemeral.in
+++ b/src/lxc/lxc-start-ephemeral.in
@@ -251,8 +251,7 @@ The following IP addresses have be found in the container:
        sys.exit(0)
    else:
        dest.console(tty=1)
-        if not dest.shutdown(timeout=5):
-            dest.stop()
+        dest.shutdown(timeout=5)
        sys.exit(0)

 # Now deal with the case where we want to run a command in the container
@@ -286,5 +285,4 @@ for ip in ips:
    break

 # Shutdown the container
-if not dest.shutdown(timeout=5):
-    dest.stop()
+dest.shutdown(timeout=5)