From 4b5332081e1eec84b94e6ca721b11098d8322b07 Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Fri, 6 Nov 2015 19:36:52 +0100 Subject: [PATCH] add DROPINS for org.cups.cupsd systemd files. --- Makefile | 1 + rpm_spec/core-vm.spec | 3 +++ vm-systemd/org.cups.cupsd.path.d/30_qubes.conf | 2 ++ vm-systemd/org.cups.cupsd.service.d/30_qubes.conf | 2 ++ vm-systemd/org.cups.cupsd.socket.d/30_qubes.conf | 2 ++ 5 files changed, 10 insertions(+) create mode 100644 vm-systemd/org.cups.cupsd.path.d/30_qubes.conf create mode 100644 vm-systemd/org.cups.cupsd.service.d/30_qubes.conf create mode 100644 vm-systemd/org.cups.cupsd.socket.d/30_qubes.conf diff --git a/Makefile b/Makefile index 888cf95..540ba80 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ DROPIN_DIR ?= "lib/systemd/system" DROPINS := chronyd.service crond.service cups.service cups.path cups.socket ModemManager.service DROPINS += NetworkManager.service NetworkManager-wait-online.service ntpd.service getty@tty.service DROPINS += tmp.mount +DROPINS += org.cups.cupsd.service org.cups.cupsd.path org.cups.cupsd.socket # Debian Dropins ifeq ($(shell lsb_release -is), Debian) diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 2835b82..e8b4747 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -517,6 +517,9 @@ The Qubes core startup configuration for SystemD init. /lib/systemd/system/cups.service.d/30_qubes.conf /lib/systemd/system/cups.socket.d/30_qubes.conf /lib/systemd/system/cups.path.d/30_qubes.conf +/lib/systemd/system/org.cups.cupsd.service.d/30_qubes.conf +/lib/systemd/system/org.cups.cupsd.socket.d/30_qubes.conf +/lib/systemd/system/org.cups.cupsd.path.d/30_qubes.conf /lib/systemd/system/getty@tty.service.d/30_qubes.conf /lib/systemd/system/ModemManager.service.d/30_qubes.conf /lib/systemd/system/NetworkManager.service.d/30_qubes.conf diff --git a/vm-systemd/org.cups.cupsd.path.d/30_qubes.conf b/vm-systemd/org.cups.cupsd.path.d/30_qubes.conf new file mode 100644 index 0000000..7762255 --- /dev/null +++ b/vm-systemd/org.cups.cupsd.path.d/30_qubes.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=/var/run/qubes-service/cups diff --git a/vm-systemd/org.cups.cupsd.service.d/30_qubes.conf b/vm-systemd/org.cups.cupsd.service.d/30_qubes.conf new file mode 100644 index 0000000..7762255 --- /dev/null +++ b/vm-systemd/org.cups.cupsd.service.d/30_qubes.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=/var/run/qubes-service/cups diff --git a/vm-systemd/org.cups.cupsd.socket.d/30_qubes.conf b/vm-systemd/org.cups.cupsd.socket.d/30_qubes.conf new file mode 100644 index 0000000..7762255 --- /dev/null +++ b/vm-systemd/org.cups.cupsd.socket.d/30_qubes.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=/var/run/qubes-service/cups