From 414f944cf98e5ffe90bdf6eb5cb374d688535a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 5 Dec 2017 17:53:44 +0100 Subject: [PATCH] Disable cups-browsed service together with cups It tries to connect to cups every second and doesn't do anything else when cups is disabled. So disable (or enable) both of them at the same time. --- Makefile | 3 ++- debian/qubes-core-agent.install | 1 + rpm_spec/core-agent.spec | 1 + vm-systemd/cups-browsed.service.d/30_qubes.conf | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 vm-systemd/cups-browsed.service.d/30_qubes.conf diff --git a/Makefile b/Makefile index 5a19bca..36260dd 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,8 @@ all: 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 +SYSTEM_DROPINS += cups.service cups-browsed.service cups.path cups.socket ModemManager.service SYSTEM_DROPINS += NetworkManager.service NetworkManager-wait-online.service getty@tty.service SYSTEM_DROPINS += tinyproxy.service SYSTEM_DROPINS += tmp.mount diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 7c1b0c3..8b0d709 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -62,6 +62,7 @@ lib/systemd/system/cron.service.d/30_qubes.conf lib/systemd/system/cups.path.d/30_qubes.conf lib/systemd/system/cups.service.d/30_qubes.conf lib/systemd/system/cups.socket.d/30_qubes.conf +lib/systemd/system/cups-browsed.service.d/30_qubes.conf lib/systemd/system/exim4.service.d/30_qubes.conf lib/systemd/system/getty@tty.service.d/30_qubes.conf lib/systemd/system/netfilter-persistent.service.d/30_qubes.conf diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec index 129cb3a..1934697 100644 --- a/rpm_spec/core-agent.spec +++ b/rpm_spec/core-agent.spec @@ -822,6 +822,7 @@ 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/cups-browsed.service.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 diff --git a/vm-systemd/cups-browsed.service.d/30_qubes.conf b/vm-systemd/cups-browsed.service.d/30_qubes.conf new file mode 100644 index 0000000..54104ad --- /dev/null +++ b/vm-systemd/cups-browsed.service.d/30_qubes.conf @@ -0,0 +1,3 @@ +[Unit] +ConditionPathExists=/var/run/qubes-service/cups +After=qubes-sysinit.service