Skip to content

Commit eb8c3b3

Browse files
committed
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 <philipp@redfish-solutions.com>
1 parent 3554c26 commit eb8c3b3

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

net/isc-dhcp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PKG_NAME:=isc-dhcp
1111
UPSTREAM_NAME:=dhcp
1212
PKG_REALVERSION:=4.4.3-P1
1313
PKG_VERSION:=4.4.3_p1
14-
PKG_RELEASE:=14
14+
PKG_RELEASE:=15
1515

1616
PKG_LICENSE:=BSD-3-Clause
1717
PKG_LICENSE_FILES:=LICENSE

net/isc-dhcp/files/dhcpd.init

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -719,14 +719,15 @@ reload_service() {
719719
}
720720

721721
add_interface_trigger() {
722-
local cfg=$1
723-
local trigger ignore
722+
local cfg="$1"
723+
local net ignore ifname
724724

725-
config_get trigger "$cfg" interface
725+
config_get net "$cfg" interface
726726
config_get_bool ignore "$cfg" ignore 0
727727

728-
if [ -n "$trigger" ] && [ $ignore -eq 0 ]; then
729-
procd_add_reload_interface_trigger "$trigger"
728+
if [ -n "$net" ] && [ $ignore -eq 0 ]; then
729+
network_get_device ifname "$net"
730+
procd_add_reload_interface_trigger "$ifname"
730731
fi
731732
}
732733

0 commit comments

Comments
 (0)