Wait for session only if necessary

The 'gui' feature is not passed via QubesDB to the qube, if it was, only
one service would be necessary.

For: QubesOS/qubes-issues#1512

Author: ben-grande

debian/qubes-core-agent.install

@@ -37,6 +37,7 @@ etc/qubes-rpc/qubes.VMRootShell
 etc/qubes-rpc/qubes.VMExec
 etc/qubes-rpc/qubes.VMExecGUI
 etc/qubes-rpc/qubes.WaitForSession
+etc/qubes-rpc/qubes.WaitForRunningSystem
 etc/qubes-rpc/qubes.GetDate
 etc/qubes-suspend-module-blacklist
 etc/qubes/autostart/*

qubes-rpc/Makefile

@@ -77,6 +77,7 @@ install:
 		qubes.SuspendPreAll \
 		qubes.SuspendPostAll \
 		qubes.WaitForSession \
+		qubes.WaitForRunningSystem \
 		qubes.DetachPciDevice \
 		qubes.Backup qubes.Restore \
 		qubes.RegisterBackupLocation \

qubes-rpc/qubes.WaitForRunningSystem

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -eu
+systemctl --wait --quiet is-system-running
+exit 0

qubes-rpc/qubes.WaitForSession

@@ -1,11 +1,12 @@
 #!/bin/sh
-
-USERNAME="$(qubesdb-read /default-user || echo 'user')"
-
-while ! [ -e "/var/run/qubes/qrexec-server.$USERNAME.sock" ]
-do
-    sleep 0.1
-done
+set -eu
+
+if qubesdb-read -q /qubes-gui-domain-xid >/dev/null; then
+    user="$(qubesdb-read /default-user || echo 'user')"
+    while ! [ -e "/var/run/qubes/qrexec-server.$user.sock" ]; do
+        sleep 0.1
+    done
+fi
 
 systemctl --user --wait --quiet is-system-running
 

rpm_spec/core-agent.spec.in

@@ -917,6 +917,7 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/qubes-rpc/qubes.SuspendPost
 %config(noreplace) /etc/qubes-rpc/qubes.SuspendPostAll
 %config(noreplace) /etc/qubes-rpc/qubes.WaitForSession
+%config(noreplace) /etc/qubes-rpc/qubes.WaitForRunningSystem
 %config(noreplace) /etc/qubes-rpc/qubes.DetachPciDevice
 %config(noreplace) /etc/qubes-rpc/qubes.Backup
 %config(noreplace) /etc/qubes-rpc/qubes.Restore