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

Disable cups-browsed service together with cups

Browse Source 
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.
This commit is contained in:
Marek Marczykowski-Górecki 2017-12-05 17:53:44 +01:00
parent 0500719f4d
commit 414f944cf9
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -55,7 +55,8 @@ all:
SYSTEM_DROPIN_DIR ?= "lib/systemd/system" SYSTEM_DROPIN_DIR ?= "lib/systemd/system"
USER_DROPIN_DIR ?= "usr/lib/systemd/user" 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 += NetworkManager.service NetworkManager-wait-online.service getty@tty.service
SYSTEM_DROPINS += tinyproxy.service SYSTEM_DROPINS += tinyproxy.service
SYSTEM_DROPINS += tmp.mount SYSTEM_DROPINS += tmp.mount

1
debian/qubes-core-agent.install vendored
View File

@ -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.path.d/30_qubes.conf
lib/systemd/system/cups.service.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.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/exim4.service.d/30_qubes.conf
lib/systemd/system/getty@tty.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 lib/systemd/system/netfilter-persistent.service.d/30_qubes.conf

1
rpm_spec/core-agent.spec
View File

@ -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.service.d/30_qubes.conf
/lib/systemd/system/cups.socket.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.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.service.d/30_qubes.conf
/lib/systemd/system/org.cups.cupsd.socket.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/org.cups.cupsd.path.d/30_qubes.conf

3
vm-systemd/cups-browsed.service.d/30_qubes.conf Normal file
View File

@ -0,0 +1,3 @@
[Unit]
ConditionPathExists=/var/run/qubes-service/cups
After=qubes-sysinit.service