From 7a5bef0d7d4c05b1fec9135a562cc774df20abfa Mon Sep 17 00:00:00 2001 From: Robert Langhammer Date: Wed, 16 Mar 2022 11:44:12 +0100 Subject: [PATCH] fff-fastd: fix fastd start/stop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fastd startup changed to procd. That's why it's broken. Now a fastd reload can be used for all conditions. An extra fastd stop is implemented to bring down the Interface. fastd reload doesn't do that. Fixes: #215 Signed-off-by: Robert Langhammer Acked-by: Fabian Bläse --- .../fff/fff-fastd/files/usr/lib/vpn-select.d/fastd | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/packages/fff/fff-fastd/files/usr/lib/vpn-select.d/fastd b/src/packages/fff/fff-fastd/files/usr/lib/vpn-select.d/fastd index 0fde6809..2474ae17 100644 --- a/src/packages/fff/fff-fastd/files/usr/lib/vpn-select.d/fastd +++ b/src/packages/fff/fff-fastd/files/usr/lib/vpn-select.d/fastd @@ -1,7 +1,7 @@ protocol=fastd fastd_clear() { - rm /tmp/fastd_fff_peers/* + rm /tmp/fastd_fff_peers/* 2>/dev/null } fastd_addpeer() { @@ -21,14 +21,9 @@ fastd_addpeer() { } fastd_start_stop() { - /etc/init.d/fastd reload # does nothing if fastd was not running - - # fastd start/stop for various situations - # this is needed for first start and if fastd comes up or disappears in hoodfile - pidfile="/tmp/run/fastd.fff.pid" - if [ "$(ls /etc/fastd/fff/peers/* 2>/dev/null)" ]; then - ([ -s "$pidfile" ] && [ -d "/proc/$(cat "$pidfile")" ]) || /etc/init.d/fastd start + if ls /etc/fastd/fff/peers/* &>/dev/null; then + /etc/init.d/fastd reload else - ([ -s "$pidfile" ] && [ -d "/proc/$(cat "$pidfile")" ]) && /etc/init.d/fastd stop + /etc/init.d/fastd stop fi }