From 6a9f2bcda761a2da3f140f106a2ea817ee770e68 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Wed, 7 Jan 2026 17:42:39 -0700 Subject: [PATCH] isc-dhcp: don't die when a network restart happens Our triggering code was using the logical network name and not the ifname as required. Signed-off-by: Philip Prindeville --- net/isc-dhcp/Makefile | 2 +- net/isc-dhcp/files/dhcpd.init | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index 25a5ebf329..6bd514e8a0 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=isc-dhcp UPSTREAM_NAME:=dhcp PKG_REALVERSION:=4.4.3-P1 PKG_VERSION:=4.4.3_p1 -PKG_RELEASE:=15 +PKG_RELEASE:=16 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/net/isc-dhcp/files/dhcpd.init b/net/isc-dhcp/files/dhcpd.init index 0370f33a1d..2470ecef05 100755 --- a/net/isc-dhcp/files/dhcpd.init +++ b/net/isc-dhcp/files/dhcpd.init @@ -724,14 +724,15 @@ reload_service() { } add_interface_trigger() { - local cfg=$1 - local trigger ignore + local cfg="$1" + local net ignore ifname - config_get trigger "$cfg" interface + config_get net "$cfg" interface config_get_bool ignore "$cfg" ignore 0 - if [ -n "$trigger" ] && [ $ignore -eq 0 ]; then - procd_add_reload_interface_trigger "$trigger" + if [ -n "$net" ] && [ $ignore -eq 0 ]; then + network_get_device ifname "$net" + procd_add_reload_interface_trigger "$ifname" fi } -- 2.30.2