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

In qvm-start, check $DISPLAY existence, too.

Browse Source
This commit is contained in:
Rafal Wojtczuk 2011-03-07 16:05:36 +01:00
parent 62d0127647
commit eb7821771e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ from qubes.qubes import QubesVmCollection
from qubes.qubes import QubesException from qubes.qubes import QubesException
from optparse import OptionParser from optparse import OptionParser
import subprocess import subprocess
import os
qubes_guid_path = "/usr/bin/qubes_guid" qubes_guid_path = "/usr/bin/qubes_guid"
qrexec_daemon_path = "/usr/lib/qubes/qrexec_daemon" qrexec_daemon_path = "/usr/lib/qubes/qrexec_daemon"
@ -61,20 +62,22 @@ def main():
print "ERROR: {0}".format(err) print "ERROR: {0}".format(err)
exit (1) exit (1)
if not options.noguid and os.getenv("DISPLAY") is not None:
if options.verbose:
print "--> Starting Qubes GUId..."
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) :
print "ERROR: Cannot start qubes_guid!"
exit (1)
if options.verbose:
print "--> Starting Qubes rexec..."
retcode = subprocess.call ([qrexec_daemon_path, str(xid)]) retcode = subprocess.call ([qrexec_daemon_path, str(xid)])
if (retcode != 0) : if (retcode != 0) :
print "ERROR: Cannot start qrexec_daemon!" print "ERROR: Cannot start qrexec_daemon!"
exit (1) exit (1)
if options.noguid:
exit (0)
if options.verbose:
print "--> Starting Qubes GUId..."
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) :
print "ERROR: Cannot start qubes_guid!"
exit (1)
main() main()