Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
Olivier MEDOC 2015-11-07 18:28:45 +01:00
parent ce4725523f
commit 0c33c73b8e
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -53,6 +53,9 @@ SYSTEM_DROPINS += NetworkManager.service NetworkManager-wait-online.service ntpd
SYSTEM_DROPINS += tmp.mount SYSTEM_DROPINS += tmp.mount
SYSTEM_DROPINS += org.cups.cupsd.service org.cups.cupsd.path org.cups.cupsd.socket 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 # Debian Dropins
ifeq ($(shell lsb_release -is), Debian) ifeq ($(shell lsb_release -is), Debian)
# Don't have 'ntpd' in 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/ ;\ install -m 0644 vm-systemd/$${dropin}.d/*.conf $(DESTDIR)/$(DROPIN_DIR)/system/$${dropin}.d/ ;\
done 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-systemd:
install -d $(DESTDIR)$(SYSLIBDIR)/systemd/system{,-preset} $(DESTDIR)$(LIBDIR)/qubes/init $(DESTDIR)$(SYSLIBDIR)/modules-load.d 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/ install -m 0755 vm-systemd/*.sh $(DESTDIR)$(LIBDIR)/qubes/init/

2
rpm_spec/core-vm.spec
View File

@ -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/NetworkManager-wait-online.service.d/30_qubes.conf
/lib/systemd/system/ntpd.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/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 %post systemd

4
vm-systemd/user/pulseaudio.service.d/30_qubes.conf Normal file
View File

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

4
vm-systemd/user/pulseaudio.socket.d/30_qubes.conf Normal file
View File

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