Browse Source

Merge branch 'fixes20210209'

Marek Marczykowski-Górecki 3 years ago
parent
commit
dfcf870f5d

+ 0 - 3
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

+ 2 - 0
autostart-dropins/xfce4-notifyd.desktop

@@ -0,0 +1,2 @@
+[Desktop Entry]
+OnlyShowIn=XFCE;X-QUBES;

+ 0 - 1
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

+ 0 - 5
vm-systemd/haveged.service

@@ -1,5 +0,0 @@
-.include /lib/systemd/system/haveged.service
-
-[Install]
-WantedBy=
-WantedBy=multi-user.target