From 94dad3640cb6cfe3540a971fa05712fa78ee6bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Wed, 17 Apr 2019 11:37:03 +0200 Subject: [PATCH] Use exec to ease systemd handling the tinyproxy process From Marek's comments --- misc/tinyproxy-wrapper | 4 ++-- vm-systemd/qubes-updates-proxy.service | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/tinyproxy-wrapper b/misc/tinyproxy-wrapper index e4b056e..672c45b 100644 --- a/misc/tinyproxy-wrapper +++ b/misc/tinyproxy-wrapper @@ -2,10 +2,10 @@ if [ -e /usr/sbin/tinyproxy ]; then echo "Found tinyproxy at /usr/sbin/tinyproxy" - /usr/sbin/tinyproxy "$@" + exec /usr/sbin/tinyproxy "$@" elif [ -e /usr/bin/tinyproxy ]; then echo "Found tinyproxy at /usr/bin/tinyproxy" - /usr/bin/tinyproxy "$@" + exec /usr/bin/tinyproxy "$@" else echo "tinyproxy not found" exit 1 diff --git a/vm-systemd/qubes-updates-proxy.service b/vm-systemd/qubes-updates-proxy.service index eca25bb..0aec98d 100644 --- a/vm-systemd/qubes-updates-proxy.service +++ b/vm-systemd/qubes-updates-proxy.service @@ -5,7 +5,7 @@ After=qubes-iptables.service [Service] ExecStartPre=/usr/lib/qubes/iptables-updates-proxy start -ExecStart=/bin/bash -c '/usr/lib/qubes/tinyproxy-wrapper -d -c /etc/tinyproxy/tinyproxy-updates.conf' +ExecStart=/usr/lib/qubes/tinyproxy-wrapper -d -c /etc/tinyproxy/tinyproxy-updates.conf ExecStopPost=/usr/lib/qubes/iptables-updates-proxy stop Restart=on-failure RestartSec=5s