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

systemd: place user dropins in /usr/lib instead of /lib

Browse Source 
On non-Fedora those are not equivalent. On Debian, user units in /lib
are not supported

Reported by @adrelanos
Fixes QubesOS/qubes-issues#2644
This commit is contained in:
Marek Marczykowski-Górecki 2017-02-21 01:29:04 +01:00
parent cf97f4f8e7
commit d8e568fa13
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -51,7 +51,8 @@ all:
make -C qubes-rpc make -C qubes-rpc
# Dropin Directory # Dropin Directory
DROPIN_DIR ?= "lib/systemd" SYSTEM_DROPIN_DIR ?= "lib/systemd/system"
USER_DROPIN_DIR ?= "usr/lib/systemd/user"
SYSTEM_DROPINS := chronyd.service crond.service cups.service cups.path cups.socket ModemManager.service SYSTEM_DROPINS := chronyd.service crond.service cups.service cups.path cups.socket ModemManager.service
SYSTEM_DROPINS += NetworkManager.service NetworkManager-wait-online.service ntpd.service getty@tty.service SYSTEM_DROPINS += NetworkManager.service NetworkManager-wait-online.service ntpd.service getty@tty.service
@ -96,14 +97,14 @@ endif
install-systemd-dropins: install-systemd-dropins:
# Install system dropins # Install system dropins
@for dropin in $(SYSTEM_DROPINS); do \ @for dropin in $(SYSTEM_DROPINS); do \
install -d $(DESTDIR)/$(DROPIN_DIR)/system/$${dropin}.d ;\ install -d $(DESTDIR)/$(SYSTEM_DROPIN_DIR)/$${dropin}.d ;\
install -m 0644 vm-systemd/$${dropin}.d/*.conf $(DESTDIR)/$(DROPIN_DIR)/system/$${dropin}.d/ ;\ install -m 0644 vm-systemd/$${dropin}.d/*.conf $(DESTDIR)/$(SYSTEM_DROPIN_DIR)/$${dropin}.d/ ;\
done done
# Install user dropins # Install user dropins
@for dropin in $(USER_DROPINS); do \ @for dropin in $(USER_DROPINS); do \
install -d $(DESTDIR)/$(DROPIN_DIR)/user/$${dropin}.d ;\ install -d $(DESTDIR)/$(USER_DROPIN_DIR)/$${dropin}.d ;\
install -m 0644 vm-systemd/user/$${dropin}.d/*.conf $(DESTDIR)/$(DROPIN_DIR)/user/$${dropin}.d/ ;\ install -m 0644 vm-systemd/user/$${dropin}.d/*.conf $(DESTDIR)/$(USER_DROPIN_DIR)/$${dropin}.d/ ;\
done done
install-init: install-init:

4
rpm_spec/core-vm.spec
View File

@ -655,8 +655,8 @@ The Qubes core startup configuration for SystemD init.
/lib/systemd/system/tor.service.d/30_qubes.conf /lib/systemd/system/tor.service.d/30_qubes.conf
/lib/systemd/system/tor@default.service.d/30_qubes.conf /lib/systemd/system/tor@default.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 /usr/lib/systemd/user/pulseaudio.service.d/30_qubes.conf
/lib/systemd/user/pulseaudio.socket.d/30_qubes.conf /usr/lib/systemd/user/pulseaudio.socket.d/30_qubes.conf
/usr/lib/tmpfiles.d/qubes-core-agent-linux.conf /usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
%post systemd %post systemd