Merge remote-tracking branch 'qubesos/pr/47'
* qubesos/pr/47: Move /var/run/shm.id to /var/run/qubes/shm.id
This commit is contained in:
commit
85f6ff9ded
@ -2012,7 +2012,7 @@ class QubesVm(object):
|
||||
# Run GUI daemon in "invisible" mode, so applications started by
|
||||
# prerun script will not disturb the user
|
||||
extra_guid_args = ['-I']
|
||||
elif not os.path.exists('/var/run/shm.id'):
|
||||
elif not os.path.exists('/var/run/qubes/shm.id'):
|
||||
# Start GUI daemon only when shmoverride is loaded; unless
|
||||
# preparing DispVM, where it isn't needed because of "invisible"
|
||||
# mode
|
||||
|
@ -40,6 +40,7 @@ except ImportError:
|
||||
pass
|
||||
|
||||
DISPID_STATE_FILE = '/var/run/qubes/dispid'
|
||||
GUID_SHMID_FILE = '/var/run/qubes/shm.id'
|
||||
|
||||
class QubesDisposableVm(QubesVm):
|
||||
"""
|
||||
@ -222,7 +223,7 @@ class QubesDisposableVm(QubesVm):
|
||||
if qmemman_present:
|
||||
qmemman_client.close()
|
||||
|
||||
if kwargs.get('start_guid', True) and os.path.exists('/var/run/shm.id'):
|
||||
if kwargs.get('start_guid', True) and os.path.exists(GUID_SHMID_FILE):
|
||||
self.start_guid(verbose=verbose, before_qrexec=True,
|
||||
notify_function=kwargs.get('notify_function', None))
|
||||
|
||||
@ -230,7 +231,7 @@ class QubesDisposableVm(QubesVm):
|
||||
notify_function=kwargs.get('notify_function', None))
|
||||
print >>sys.stderr, "time=%s, qrexec done" % (str(time.time()))
|
||||
|
||||
if kwargs.get('start_guid', True) and os.path.exists('/var/run/shm.id'):
|
||||
if kwargs.get('start_guid', True) and os.path.exists(GUID_SHMID_FILE):
|
||||
self.start_guid(verbose=verbose,
|
||||
notify_function=kwargs.get('notify_function', None))
|
||||
print >>sys.stderr, "time=%s, guid done" % (str(time.time()))
|
||||
|
Loading…
Reference in New Issue
Block a user