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

dom0/qubesutils: additional types of run comand in vm (wait and popen)

Browse Source
This commit is contained in:
Marek Marczykowski 2012-02-01 16:54:04 +01:00
parent ead9e445bc
commit 2aedf4567b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom0/qvm-core/qubesutils.py
View File

@ -229,7 +229,7 @@ def block_detach(vm, frontend = "xvdi", vm_xid = None):
xl_cmd = [ '/usr/sbin/xl', 'block-detach', str(vm_xid), str(frontend)] xl_cmd = [ '/usr/sbin/xl', 'block-detach', str(vm_xid), str(frontend)]
subprocess.check_call(xl_cmd) subprocess.check_call(xl_cmd)
def run_in_vm(vm, command, verbose = True, autostart = False, notify_function = None, passio = False, localcmd = None): def run_in_vm(vm, command, verbose = True, autostart = False, notify_function = None, passio = False, passio_popen = False, localcmd = None, wait = False):
assert vm is not None assert vm is not None
if not vm.is_running(): if not vm.is_running():
@ -258,7 +258,11 @@ def run_in_vm(vm, command, verbose = True, autostart = False, notify_function =
if passio: if passio:
os.execv(qrexec_client_path, args) os.execv(qrexec_client_path, args)
exit(1) exit(1)
args += ["-e"] if passio_popen:
p = subprocess.Popen (args, stdout=subprocess.PIPE)
return p
if not wait:
args += ["-e"]
return subprocess.call(args) return subprocess.call(args)
# vim:sw=4:et: # vim:sw=4:et: