dropins: implement dropins for systemd user starting with pulseaudio systemd service and socket masking

Conflicts:
	Makefile

Makefile

@@ -53,6 +53,9 @@ SYSTEM_DROPINS += NetworkManager.service NetworkManager-wait-online.service ntpd
 SYSTEM_DROPINS += tmp.mount
 SYSTEM_DROPINS += org.cups.cupsd.service org.cups.cupsd.path org.cups.cupsd.socket 
 
+# Fedora User Dropins
+USER_DROPINS := pulseaudio.service pulseaudio.socket
+
 # Debian Dropins
 ifeq ($(shell lsb_release -is), Debian)
     # Don't have 'ntpd' in Debian
@@ -76,6 +79,12 @@ install-systemd-dropins:
 	    install -m 0644 vm-systemd/$${dropin}.d/*.conf $(DESTDIR)/$(DROPIN_DIR)/system/$${dropin}.d/ ;\
 	done
 	
+	# Install user dropins
+	@for dropin in $(USER_DROPINS); do \
+	    install -d $(DESTDIR)/$(DROPIN_DIR)/user/$${dropin}.d ;\
+	    install -m 0644 vm-systemd/user/$${dropin}.d/*.conf $(DESTDIR)/$(DROPIN_DIR)/user/$${dropin}.d/ ;\
+	done
+
 install-systemd:
 	install -d $(DESTDIR)$(SYSLIBDIR)/systemd/system{,-preset} $(DESTDIR)$(LIBDIR)/qubes/init $(DESTDIR)$(SYSLIBDIR)/modules-load.d
 	install -m 0755 vm-systemd/*.sh $(DESTDIR)$(LIBDIR)/qubes/init/

rpm_spec/core-vm.spec

@@ -526,6 +526,8 @@ The Qubes core startup configuration for SystemD init.
 /lib/systemd/system/NetworkManager-wait-online.service.d/30_qubes.conf
 /lib/systemd/system/ntpd.service.d/30_qubes.conf
 /lib/systemd/system/tmp.mount.d/30_qubes.conf
+/lib/systemd/user/pulseaudio.service.d/30_qubes.conf
+/lib/systemd/user/pulseaudio.socket.d/30_qubes.conf
 
 %post systemd
 

vm-systemd/user/pulseaudio.service.d/30_qubes.conf

@@ -0,0 +1,4 @@
+[Unit]
+#ConditionNull=false
+ConditionPathExists=/var/run/qubes-service/pulseaudio-vanilla-broken
+

vm-systemd/user/pulseaudio.socket.d/30_qubes.conf

@@ -0,0 +1,4 @@
+[Unit]
+#ConditionNull=false
+ConditionPathExists=/var/run/qubes-service/pulseaudio-vanilla-broken
+