openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-04-15 19:02:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

isc-dhcp: don't die when a network restart happens

Browse Source 
Our triggering code was using the logical network name and
not the ifname as required.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
This commit is contained in:
Philip Prindeville
2026-01-07 17:42:39 -07:00
parent e9e8502f78
commit 6a9f2bcda7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/isc-dhcp/Makefile
View File

@@ -11,7 +11,7 @@ PKG_NAME:=isc-dhcp
UPSTREAM_NAME:=dhcp UPSTREAM_NAME:=dhcp
PKG_REALVERSION:=4.4.3-P1 PKG_REALVERSION:=4.4.3-P1
PKG_VERSION:=4.4.3_p1 PKG_VERSION:=4.4.3_p1
PKG_RELEASE:=15 PKG_RELEASE:=16
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

11
net/isc-dhcp/files/dhcpd.init
View File

@@ -724,14 +724,15 @@ reload_service() {
} }
add_interface_trigger() { add_interface_trigger() {
local cfg=$1 local cfg="$1"
local trigger ignore local net ignore ifname
config_get trigger "$cfg" interface config_get net "$cfg" interface
config_get_bool ignore "$cfg" ignore 0 config_get_bool ignore "$cfg" ignore 0
if [ -n "$trigger" ] && [ $ignore -eq 0 ]; then if [ -n "$net" ] && [ $ignore -eq 0 ]; then
procd_add_reload_interface_trigger "$trigger" network_get_device ifname "$net"
procd_add_reload_interface_trigger "$ifname"
fi fi
} }