qvm-features-request: add guivm-gui-agent

Makefile

@@ -131,6 +131,9 @@ install-pulseaudio:
 install-common:
 	install -D gui-agent/qubes-gui $(DESTDIR)/usr/bin/qubes-gui
 	install -D gui-common/qubes-gui-runuser $(DESTDIR)/usr/bin/qubes-gui-runuser
+	install -d $(DESTDIR)/etc/qubes/post-install.d
+	install -m 0755 appvm-scripts/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh \
+                $(DESTDIR)/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh
 	install -D appvm-scripts/usrbin/qubes-session \
 		$(DESTDIR)/usr/bin/qubes-session
 	install -D appvm-scripts/usrbin/qubes-run-xorg \

appvm-scripts/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if rpm -q xorg-x11-server-Xephyr > /dev/null; then
+    qvm-features-request service supported-service.guivm-gui-agent=1
+fi

debian/qubes-gui-agent.install

@@ -3,6 +3,7 @@ etc/profile.d/*
 etc/pam.d/qubes-gui-agent
 etc/security/limits.d/90-qubes-gui.conf
 etc/qubes-rpc/qubes.SetMonitorLayout
+etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh
 etc/xdg/autostart/qubes-icon-sender.desktop
 etc/xdg/autostart/qubes-qrexec-fork-server.desktop
 etc/xdg/Trolltech.conf

rpm_spec/gui-agent.spec.in

@@ -164,6 +164,7 @@ rm -f %{name}-%{version}
 /etc/X11/xinit/xinitrc.d/20qt-gnome-desktop-session-id.sh
 /etc/X11/xinit/xinitrc.d/50-guivm-windows-prefix.sh
 /etc/qubes-rpc/qubes.SetMonitorLayout
+/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh
 %config /etc/sysconfig/desktop
 /lib/systemd/system/qubes-gui-agent.service
 /lib/udev/rules.d/70-master-of-seat.rules