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

Handle tinyproxy path changed in upstream

Browse Source 
Related commit 8d0ea71486
Fixes QubesOS/qubes-issues#4973 and QubesOS/qubes-issues#4929
This commit is contained in:
Frédéric Pierret (fepitre) 2019-04-16 11:39:44 +02:00
parent feeb4b3816
commit 0fd8da62b6
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -315,6 +315,7 @@ install-common: install-doc
install -D -m 0644 misc/marker-vm $(DESTDIR)/usr/share/qubes/marker-vm install -D -m 0644 misc/marker-vm $(DESTDIR)/usr/share/qubes/marker-vm
cut -f 1,2 -d . version >> $(DESTDIR)/usr/share/qubes/marker-vm cut -f 1,2 -d . version >> $(DESTDIR)/usr/share/qubes/marker-vm
install -m 0755 misc/tinyproxy-wrapper $(DESTDIR)/usr/lib/qubes/tinyproxy-wrapper
install -d $(DESTDIR)/var/run/qubes install -d $(DESTDIR)/var/run/qubes
install -d $(DESTDIR)/rw install -d $(DESTDIR)/rw

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

@ -136,6 +136,7 @@ usr/lib/qubes/upgrades-installed-check
usr/lib/qubes/upgrades-status-notify usr/lib/qubes/upgrades-status-notify
usr/lib/qubes/vm-file-editor usr/lib/qubes/vm-file-editor
usr/lib/qubes/xdg-icon usr/lib/qubes/xdg-icon
usr/lib/qubes/tinyproxy-wrapper
usr/lib/systemd/user/pulseaudio.service.d/30_qubes.conf usr/lib/systemd/user/pulseaudio.service.d/30_qubes.conf
usr/lib/systemd/user/pulseaudio.socket.d/30_qubes.conf usr/lib/systemd/user/pulseaudio.socket.d/30_qubes.conf
usr/share/glib-2.0/schemas/* usr/share/glib-2.0/schemas/*

12
misc/tinyproxy-wrapper Normal file
View File

@ -0,0 +1,12 @@
#!/bin/bash
if [ -e /usr/sbin/tinyproxy ]; then
echo "Found tinyproxy at /usr/sbin/tinyproxy"
/usr/sbin/tinyproxy "$@"
elif [ -e /usr/bin/tinyproxy ]; then
echo "Found tinyproxy at /usr/bin/tinyproxy"
/usr/bin/tinyproxy "$@"
else
echo "tinyproxy not found"
exit 1
fi

1
rpm_spec/core-agent.spec.in
View File

@ -645,6 +645,7 @@ rm -f %{name}-%{version}
/usr/lib/qubes/upgrades-status-notify /usr/lib/qubes/upgrades-status-notify
/usr/lib/qubes/qubes-sync-clock /usr/lib/qubes/qubes-sync-clock
/usr/lib/qubes/resize-rootfs /usr/lib/qubes/resize-rootfs
/usr/lib/qubes/tinyproxy-wrapper
/usr/lib/yum-plugins/yum-qubes-hooks.py* /usr/lib/yum-plugins/yum-qubes-hooks.py*
/usr/lib/dracut/dracut.conf.d/30-qubes.conf /usr/lib/dracut/dracut.conf.d/30-qubes.conf
%dir /usr/lib/qubes/init %dir /usr/lib/qubes/init

2
vm-init.d/qubes-updates-proxy
View File

@ -28,7 +28,7 @@
# Check that networking is up. # Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0 [ "$NETWORKING" = "no" ] && exit 0
exec="/usr/sbin/tinyproxy" exec="$(command -v tinyproxy)"
prog=$(basename $exec) prog=$(basename $exec)
config="/etc/tinyproxy/tinyproxy-updates.conf" config="/etc/tinyproxy/tinyproxy-updates.conf"
pidfile="/var/run/tinyproxy-updates/tinyproxy.pid" pidfile="/var/run/tinyproxy-updates/tinyproxy.pid"

3
vm-systemd/qubes-updates-proxy.service
View File

@ -1,12 +1,11 @@
[Unit] [Unit]
Description=Qubes updates proxy (tinyproxy) Description=Qubes updates proxy (tinyproxy)
ConditionPathExists=|/var/run/qubes-service/qubes-yum-proxy
ConditionPathExists=|/var/run/qubes-service/qubes-updates-proxy ConditionPathExists=|/var/run/qubes-service/qubes-updates-proxy
After=qubes-iptables.service After=qubes-iptables.service
[Service] [Service]
ExecStartPre=/usr/lib/qubes/iptables-updates-proxy start ExecStartPre=/usr/lib/qubes/iptables-updates-proxy start
ExecStart=/usr/sbin/tinyproxy -d -c /etc/tinyproxy/tinyproxy-updates.conf ExecStart=/bin/bash -c '/usr/lib/qubes/tinyproxy-wrapper -d -c /etc/tinyproxy/tinyproxy-updates.conf'
ExecStopPost=/usr/lib/qubes/iptables-updates-proxy stop ExecStopPost=/usr/lib/qubes/iptables-updates-proxy stop
Restart=on-failure Restart=on-failure
RestartSec=5s RestartSec=5s