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

Merge remote-tracking branch 'qubesos/pr/47'

Browse Source 
* qubesos/pr/47:
  Move /var/run/shm.id to /var/run/qubes/shm.id
This commit is contained in:
Marek Marczykowski-Górecki 2016-11-11 16:13:51 +01:00
commit 85f6ff9ded
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-modules/000QubesVm.py
View File

@ -2012,7 +2012,7 @@ class QubesVm(object):
# Run GUI daemon in "invisible" mode, so applications started by # Run GUI daemon in "invisible" mode, so applications started by
# prerun script will not disturb the user # prerun script will not disturb the user
extra_guid_args = ['-I'] 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 # Start GUI daemon only when shmoverride is loaded; unless
# preparing DispVM, where it isn't needed because of "invisible" # preparing DispVM, where it isn't needed because of "invisible"
# mode # mode

5
core-modules/01QubesDisposableVm.py
View File

@ -40,6 +40,7 @@ except ImportError:
pass pass
DISPID_STATE_FILE = '/var/run/qubes/dispid' DISPID_STATE_FILE = '/var/run/qubes/dispid'
GUID_SHMID_FILE = '/var/run/qubes/shm.id'
class QubesDisposableVm(QubesVm): class QubesDisposableVm(QubesVm):
""" """
@ -222,7 +223,7 @@ class QubesDisposableVm(QubesVm):
if qmemman_present: if qmemman_present:
qmemman_client.close() 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, self.start_guid(verbose=verbose, before_qrexec=True,
notify_function=kwargs.get('notify_function', None)) notify_function=kwargs.get('notify_function', None))
@ -230,7 +231,7 @@ class QubesDisposableVm(QubesVm):
notify_function=kwargs.get('notify_function', None)) notify_function=kwargs.get('notify_function', None))
print >>sys.stderr, "time=%s, qrexec done" % (str(time.time())) 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, self.start_guid(verbose=verbose,
notify_function=kwargs.get('notify_function', None)) notify_function=kwargs.get('notify_function', None))
print >>sys.stderr, "time=%s, guid done" % (str(time.time())) print >>sys.stderr, "time=%s, guid done" % (str(time.time()))