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>

diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile
index 25a5ebf32941de725b709316ba887a3645eab319..6bd514e8a0391da6eba71ea092c37405b877e628 100644 (file)
--- 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 0370f33a1d1db9fac61543a936e0c5975e6a179a..2470ecef0516d6e15de9002268ded6fe00246312 100755 (executable)
--- 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
 }