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

core: Do not kill the VM when qrexec connect timed out (#790)

Browse Source 
In such case show an error to the user (via tray notification, not
dialog box!) and leave the VM in "transient" state. The user can wait
some more time for VM startup, check what VM is doing, or kill it
manually.
This commit is contained in:
Marek Marczykowski-Górecki 2014-02-05 03:27:12 +01:00
parent f4a2fcc8ae
commit 86d3e2f4dd
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core-modules/000QubesVm.py
View File

@ -656,12 +656,17 @@ class QubesVm(object):
return False return False
return True return True
def is_qrexec_running(self):
if self.xid < 0:
return False
return os.path.exists('/var/run/qubes/qrexec.%s' % self.name)
def is_fully_usable(self): def is_fully_usable(self):
# Running gui-daemon implies also VM running # Running gui-daemon implies also VM running
if not self.is_guid_running(): if not self.is_guid_running():
return False return False
# currently qrexec daemon doesn't cleanup socket in /var/run/qubes, so if not self.is_qrexec_running():
# it can be left from some other VM return False
return True return True
def is_running(self): def is_running(self):
@ -1366,11 +1371,16 @@ class QubesVm(object):
elif verbose: elif verbose:
print >> sys.stderr, "Starting the VM '{0}'...".format(self.name) print >> sys.stderr, "Starting the VM '{0}'...".format(self.name)
xid = self.start(verbose=verbose, start_guid = gui, notify_function=notify_function) xid = self.start(verbose=verbose, start_guid = gui, notify_function=notify_function)
except (IOError, OSError, QubesException) as err: except (IOError, OSError, QubesException) as err:
raise QubesException("Error while starting the '{0}' VM: {1}".format(self.name, err)) raise QubesException("Error while starting the '{0}' VM: {1}".format(self.name, err))
except (MemoryError) as err: except (MemoryError) as err:
raise QubesException("Not enough memory to start '{0}' VM! Close one or more running VMs and try again.".format(self.name)) raise QubesException("Not enough memory to start '{0}' VM! "
"Close one or more running VMs and try "
"again.".format(self.name))
if not self.is_qrexec_running():
raise QubesException(
"Domain '{}': qrexec not connected.".format(self.name))
xid = self.get_xid() xid = self.get_xid()
if gui and os.getenv("DISPLAY") is not None and not self.is_guid_running(): if gui and os.getenv("DISPLAY") is not None and not self.is_guid_running():
@ -1490,8 +1500,7 @@ class QubesVm(object):
qrexec_env['QREXEC_STARTUP_TIMEOUT'] = str(self.qrexec_timeout) qrexec_env['QREXEC_STARTUP_TIMEOUT'] = str(self.qrexec_timeout)
retcode = subprocess.call ([system_path["qrexec_daemon_path"], str(xid), self.name, self.default_user], env=qrexec_env) retcode = subprocess.call ([system_path["qrexec_daemon_path"], str(xid), self.name, self.default_user], env=qrexec_env)
if (retcode != 0) : if (retcode != 0) :
self.force_shutdown(xid=xid) raise OSError ("Cannot execute qrexec-daemon!")
raise OSError ("ERROR: Cannot execute qrexec-daemon!")
def start(self, debug_console = False, verbose = False, preparing_dvm = False, start_guid = True, notify_function = None): def start(self, debug_console = False, verbose = False, preparing_dvm = False, start_guid = True, notify_function = None):
if dry_run: if dry_run: