proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 09:01:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Stéphane Graber 2012-09-13 10:03:21 -04:00
parent 225b52ef15
commit 9737a2060c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/lxc-start-ephemeral.in
View File

@ -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:
break break
# Shutdown the container # Shutdown the container
if not dest.shutdown(timeout=5): dest.shutdown(timeout=5)
dest.stop()