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

Merge remote-tracking branch 'origin/pr/46'

Browse Source 
* origin/pr/46:
  No longer start /etc/init.d/tinyproxy by default anymore.
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-11 16:04:40 +01:00
commit 3324307ee2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -47,6 +47,7 @@ DROPIN_DIR ?= "lib/systemd"
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 += tinyproxy.service
SYSTEM_DROPINS += tmp.mount
SYSTEM_DROPINS += org.cups.cupsd.service org.cups.cupsd.path org.cups.cupsd.socket
@ -74,7 +75,7 @@ install-systemd-dropins:
install -d $(DESTDIR)/$(DROPIN_DIR)/system/$${dropin}.d ;\
install -m 0644 vm-systemd/$${dropin}.d/*.conf $(DESTDIR)/$(DROPIN_DIR)/system/$${dropin}.d/ ;\
done
# Install user dropins
@for dropin in $(USER_DROPINS); do \
install -d $(DESTDIR)/$(DROPIN_DIR)/user/$${dropin}.d ;\

1
rpm_spec/core-vm.spec
View File

@ -528,6 +528,7 @@ The Qubes core startup configuration for SystemD init.
/lib/systemd/system/NetworkManager.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/tinyproxy.service.d/30_not_needed_in_qubes_by_default.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

2
vm-systemd/tinyproxy.service.d/30_not_needed_in_qubes_by_default.conf Normal file
View File

@ -0,0 +1,2 @@
[Unit]
ConditionPathExists=/var/run/qubes-service/tinyproxy