From 0e04298dfc42d7263479a9c383bd714149d6d1fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 9 Feb 2021 20:24:51 +0100 Subject: [PATCH 1/2] Start xfce4-notifyd when installed It doesn't support bus-activation as the others notification daemons. --- autostart-dropins/xfce4-notifyd.desktop | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 autostart-dropins/xfce4-notifyd.desktop diff --git a/autostart-dropins/xfce4-notifyd.desktop b/autostart-dropins/xfce4-notifyd.desktop new file mode 100644 index 0000000..bcce827 --- /dev/null +++ b/autostart-dropins/xfce4-notifyd.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +OnlyShowIn=XFCE;X-QUBES; From 30f6c496bc5bef2d2bbebcee597378f96aad5342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 9 Feb 2021 20:54:00 +0100 Subject: [PATCH 2/2] Remove haveged service override It was needed for Debian stretch only. --- Makefile | 3 --- debian/qubes-core-agent.install | 1 - vm-systemd/haveged.service | 5 ----- 3 files changed, 9 deletions(-) delete mode 100644 vm-systemd/haveged.service diff --git a/Makefile b/Makefile index 9d52376..52c4d7b 100644 --- a/Makefile +++ b/Makefile @@ -199,9 +199,6 @@ install-deb: install-common install-systemd install-systemd-dropins install-syst install -d $(DESTDIR)/etc/needrestart/conf.d install -D -m 0644 misc/50_qubes.conf $(DESTDIR)/etc/needrestart/conf.d/50_qubes.conf - mkdir -p $(DESTDIR)/etc/systemd/system/ - install -m 0644 vm-systemd/haveged.service $(DESTDIR)/etc/systemd/system/ - install-corevm: install-rh install-common install-systemd install-sysvinit install-systemd-dropins install-networking install-netvm: install-systemd-networking-dropins install-networkmanager diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 9ac4bbf..1d9019f 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -60,7 +60,6 @@ etc/sudoers.d/qt_x11_no_mitshm etc/sudoers.d/umask etc/sysctl.d/20_tcp_timestamps.conf etc/sysctl.d/80-qubes.conf -etc/systemd/system/haveged.service etc/systemd/system/xendriverdomain.service lib/modules-load.d/qubes-core.conf lib/systemd/system-preset/75-qubes-vm.preset diff --git a/vm-systemd/haveged.service b/vm-systemd/haveged.service deleted file mode 100644 index 6dea9b4..0000000 --- a/vm-systemd/haveged.service +++ /dev/null @@ -1,5 +0,0 @@ -.include /lib/systemd/system/haveged.service - -[Install] -WantedBy= -WantedBy=multi-user.target