From ada9d25ef7d2466cd62165ab38cfa6e8f574f83b Mon Sep 17 00:00:00 2001 From: Jan Baier Date: Wed, 18 Aug 2021 14:17:28 +0200 Subject: [PATCH] simple-adblock: Call killall with the -s Some versions of killall do support the `killall -SIGNAL` syntax and have only `-s SIGNAL` which should be supported everywhere. I see the problem with *killall (PSmisc) 23.3* on latest TurrisOS 5.2 Signed-off-by: Jan Baier --- net/simple-adblock/Makefile | 2 +- net/simple-adblock/files/simple-adblock.init | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index d521a2e80..4fd86b808 100644 --- a/net/simple-adblock/Makefile +++ b/net/simple-adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-adblock PKG_VERSION:=1.8.7 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init index 799987705..6f9bf92d4 100644 --- a/net/simple-adblock/files/simple-adblock.init +++ b/net/simple-adblock/files/simple-adblock.init @@ -116,8 +116,8 @@ compare_values() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } is_chaos_calmer() { ubus -S call system board | grep -q 'Chaos Calmer'; } led_on(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'default-on' > "${1}/trigger" 2>&1; fi; } led_off(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'none' > "${1}/trigger" 2>&1; fi; } -dnsmasq_hup() { killall -q -HUP dnsmasq; } -dnsmasq_kill() { killall -q -KILL dnsmasq; } +dnsmasq_hup() { killall -q -s HUP dnsmasq; } +dnsmasq_kill() { killall -q -s KILL dnsmasq; } dnsmasq_restart() { /etc/init.d/dnsmasq restart >/dev/null 2>&1; } unbound_restart() { /etc/init.d/unbound restart >/dev/null 2>&1; } is_force_dns_active() { iptables-save | grep -q -w -- '--dport 53'; }