From 76d61e3b400833264fbd9b656f531218fed75c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 13 Dec 2023 13:21:46 +0100 Subject: [PATCH] Do not show "Displays" prompt in every VM when new display is connected Default Xfce setting is to prompt what to do when new display is connected. It makes sense in dom0 (or GUI domain), but not really in every VM. Disable it by default. When setting up GUI domain, it will need to be re-enabled manually (or possibly via salt). Fixes QubesOS/qubes-issues#8756 --- debian/qubes-core-agent.install | 1 + misc/Makefile | 1 + misc/displays.xml | 6 ++++++ rpm_spec/core-agent.spec.in | 1 + 4 files changed, 9 insertions(+) create mode 100644 misc/displays.xml diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index f774e9b0..2f2ac634 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -61,6 +61,7 @@ etc/sysctl.d/20_tcp_timestamps.conf etc/sysctl.d/80-qubes.conf etc/systemd/system/xendriverdomain.service etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml +etc/xdg/xfce4/xfconf/xfce-perchannel-xml/displays.xml lib/modules-load.d/qubes-core.conf lib/systemd/system-preset/75-qubes-vm.preset lib/systemd/system/boot.automount.d/30_qubes.conf diff --git a/misc/Makefile b/misc/Makefile index 3cb84a4a..8325e772 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -51,6 +51,7 @@ install: install -m 0755 -t $(DESTDIR)$(QUBESLIBDIR) set-default-text-editor install -m 0755 -d $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml install -m 0644 -t $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml xfce4-notifyd.xml + install -m 0644 -t $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml displays.xml marker-vm: marker-vm.in printf "$(VERSION)" | cut -f 1,2 -d . | cat $< - > marker-vm diff --git a/misc/displays.xml b/misc/displays.xml new file mode 100644 index 00000000..2546eed6 --- /dev/null +++ b/misc/displays.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index e63aef6f..8e230811 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -958,6 +958,7 @@ rm -f %{name}-%{version} %dir /etc/dconf/db/local.d %config(noreplace) /etc/dconf/db/local.d/dpi %config(noreplace) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml +%config(noreplace) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/displays.xml %_udevrulesdir/50-qubes-mem-hotplug.rules %_unitdir/user@.service.d/90-session-stop-timeout.conf /usr/sbin/qubes-serial-login