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

Merge branch 'bug1241'

Browse Source 
Fixes QubesOS/qubes-issues#1241
This commit is contained in:
Marek Marczykowski-Górecki 2015-10-02 01:59:17 +02:00
commit 4f04c62f36
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core-modules/000QubesVm.py
View File

@ -34,6 +34,7 @@ import sys
import time import time
import uuid import uuid
import xml.parsers.expat import xml.parsers.expat
import signal
from qubes import qmemman from qubes import qmemman
from qubes import qmemman_algo from qubes import qmemman_algo
import libvirt import libvirt
@ -1717,6 +1718,18 @@ class QubesVm(object):
def start_qubesdb(self): def start_qubesdb(self):
self.log.debug('start_qubesdb()') self.log.debug('start_qubesdb()')
pidfile = '/var/run/qubes/qubesdb.{}.pid'.format(self.name)
try:
if os.path.exists(pidfile):
old_qubesdb_pid = open(pidfile, 'r').read()
os.kill(int(old_qubesdb_pid), signal.SIGTERM)
timeout = 25
while os.path.exists(pidfile) and timeout:
time.sleep(0.2)
timeout -= 1
except IOError: # ENOENT (pidfile)
pass
retcode = subprocess.call ([ retcode = subprocess.call ([
system_path["qubesdb_daemon_path"], system_path["qubesdb_daemon_path"],
str(self.xid), str(self.xid),