Skip to content

Commit

Permalink
Do not show "Displays" prompt in every VM when new display is connected
Browse files Browse the repository at this point in the history
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
  • Loading branch information
marmarek committed Dec 13, 2023
1 parent e93459f commit 76d61e3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions debian/qubes-core-agent.install
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions misc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions misc/displays.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<channel name="displays" version="1.0">
<property name="Notify" type="int" value="0"/>
</channel>

1 change: 1 addition & 0 deletions rpm_spec/core-agent.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]/90-session-stop-timeout.conf
/usr/sbin/qubes-serial-login
Expand Down

0 comments on commit 76d61e3

Please sign in to comment.