Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pull/48/head' into core3-devel

Browse Source
This commit is contained in:
Wojtek Porczyk 2016-08-03 18:25:02 +02:00
commit 288ff85731
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/vm/qubesvm.py
View File

@ -35,6 +35,7 @@ import re
import shutil import shutil
import subprocess import subprocess
import sys import sys
import time
import uuid import uuid
import warnings import warnings
@ -742,7 +743,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
return self return self
def shutdown(self, force=False): def shutdown(self, force=False, wait=False):
'''Shutdown domain. '''Shutdown domain.
:raises qubes.exc.QubesVMNotStartedError: \ :raises qubes.exc.QubesVMNotStartedError: \
@ -770,6 +771,9 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
self.libvirt_domain.shutdown() self.libvirt_domain.shutdown()
self.storage.stop() self.storage.stop()
while wait and not self.is_halted():
time.sleep(0.25)
return self return self
def kill(self): def kill(self):