Skip to content

L
lxc
Commit 9737a206 by Stéphane Graber
Options

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: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 225b52ef
Showing with 2 additions and 4 deletions
src/lxc/lxc-start-ephemeral.in
...@@ -251,8 +251,7 @@ The following IP addresses have be found in the container: ...@@ -251,8 +251,7 @@ The following IP addresses have be found in the container:
sys.exit(0) sys.exit(0)
else: else:
dest.console(tty=1) dest.console(tty=1)
if not dest.shutdown(timeout=5): dest.shutdown(timeout=5)
dest.stop()
sys.exit(0) sys.exit(0)
# Now deal with the case where we want to run a command in the container # Now deal with the case where we want to run a command in the container
...@@ -286,5 +285,4 @@ for ip in ips: ...@@ -286,5 +285,4 @@ for ip in ips:
break break
# Shutdown the container # Shutdown the container
if not dest.shutdown(timeout=5): dest.shutdown(timeout=5)
dest.stop()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment