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

qvm-tools: pass -l <label_index> to qubes_guid

Browse Source
This commit is contained in:
Joanna Rutkowska 2010-06-03 23:04:47 +02:00
parent 297d1d65d0
commit 8724c65b35
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom0/qvm-tools/qvm-run
View File

@ -81,7 +81,7 @@ def vm_run_cmd(vm, cmd, options):
if options.verbose: if options.verbose:
print "--> Starting Qubes GUId..." print "--> Starting Qubes GUId..."
retcode = subprocess.call ([qubes_guid_path, "-d", str(xid), "-c", vm.label.color, "-e", cmd, "-i", vm.label.icon]) retcode = subprocess.call ([qubes_guid_path, "-d", str(xid), "-c", vm.label.color, "-e", cmd, "-i", vm.label.icon, "-l", str(vm.label.index)])
if (retcode != 0) : if (retcode != 0) :
print "ERROR: Cannot start qubes_guid!" print "ERROR: Cannot start qubes_guid!"
if options.tray: if options.tray:
@ -105,7 +105,7 @@ def vm_run_cmd(vm, cmd, options):
s.send (cmd) s.send (cmd)
s.close() s.close()
else: else:
retcode = subprocess.call ([qubes_guid_path, "-d", str(xid), "-c", vm.label.color, "-e", cmd, "-i", vm.label.icon]) retcode = subprocess.call ([qubes_guid_path, "-d", str(xid), "-c", vm.label.color, "-e", cmd, "-i", vm.label.icon, "-l", str(vm.label.index)])
if (retcode != 0) : if (retcode != 0) :
print "ERROR: Cannot start qubes_guid!" print "ERROR: Cannot start qubes_guid!"
if options.tray: if options.tray:

2
dom0/qvm-tools/qvm-start
View File

@ -63,7 +63,7 @@ def main():
if options.verbose: if options.verbose:
print "--> Starting Qubes GUId..." print "--> Starting Qubes GUId..."
retcode = subprocess.call ([qubes_guid_path, "-d", str(xid), "-c", vm.label.color, "-i", vm.label.icon]) retcode = subprocess.call ([qubes_guid_path, "-d", str(xid), "-c", vm.label.color, "-i", vm.label.icon, "-l", str(vm.label.index)])
if (retcode != 0) : if (retcode != 0) :
print "ERROR: Cannot start qubes_guid!" print "ERROR: Cannot start qubes_guid!"
exit (1) exit (1)