From cfbb786d7f0d7db440af9d2f68bb4f5f6b885592 Mon Sep 17 00:00:00 2001 From: Jasper Tron Date: Mon, 25 Jul 2016 20:55:46 -0500 Subject: [PATCH] Move /var/run/shm.id to /var/run/qubes/shm.id This allows the gui daemon to be run without root privileges. --- core-modules/000QubesVm.py | 2 +- core-modules/01QubesDisposableVm.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core-modules/000QubesVm.py b/core-modules/000QubesVm.py index 3c0760a6..4ced3ce0 100644 --- a/core-modules/000QubesVm.py +++ b/core-modules/000QubesVm.py @@ -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 diff --git a/core-modules/01QubesDisposableVm.py b/core-modules/01QubesDisposableVm.py index 4e3ebdd8..0e11aaa1 100644 --- a/core-modules/01QubesDisposableVm.py +++ b/core-modules/01QubesDisposableVm.py @@ -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()))