From ed91d72eac34c58f7c5cbe7543b475417ebf1c9e Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sun, 10 May 2020 13:47:05 +0100 Subject: [PATCH] dnsmasq: hotplug script tidyup Hotplug scripts are sourced so the #!/bin/sh is superfluous/deceptive. Re-arrange script to only source 'procd' if we get to the stage of needing to signal the process, reduce hotplug processing load a little. Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/dnsmasq/Makefile | 2 +- package/network/services/dnsmasq/files/dnsmasqsec.hotplug | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index d07804bad0..f328d51d2c 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_UPSTREAM_VERSION:=2.81 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq diff --git a/package/network/services/dnsmasq/files/dnsmasqsec.hotplug b/package/network/services/dnsmasq/files/dnsmasqsec.hotplug index 781d533734..71f5e68b2d 100644 --- a/package/network/services/dnsmasq/files/dnsmasqsec.hotplug +++ b/package/network/services/dnsmasq/files/dnsmasqsec.hotplug @@ -1,14 +1,11 @@ -#!/bin/sh - -. /lib/functions/procd.sh - TIMEVALIDFILE="/var/state/dnsmasqsec" -[ "$ACTION" = stratum ] || exit 0 +[ "$ACTION" = "stratum" ] || exit 0 [ -f "$TIMEVALIDFILE" ] || { echo "ntpd says time is valid" >$TIMEVALIDFILE /etc/init.d/dnsmasq enabled && { + . /lib/functions/procd.sh procd_send_signal dnsmasq '*' INT } }