From 8a52c2b7428c59dc31aa9815c47f8c269bae2a11 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Tue, 25 Jul 2023 15:48:14 -0600 Subject: isc-dhcp: use network_get_device in client scripts Signed-off-by: Philip Prindeville --- net/isc-dhcp/files/dhclient6.init | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'net/isc-dhcp/files/dhclient6.init') diff --git a/net/isc-dhcp/files/dhclient6.init b/net/isc-dhcp/files/dhclient6.init index 630c3f25f..dd1a095b1 100644 --- a/net/isc-dhcp/files/dhclient6.init +++ b/net/isc-dhcp/files/dhclient6.init @@ -8,23 +8,23 @@ pid_file=/var/run/dhclient6.pid script_file=/usr/sbin/dhclient-script start() { - /usr/sbin/dhclient -q -nw -6 -cf $config_file -lf $lease_file -pf $pid_file -sf $script_file `/sbin/uci get network.wan.ifname` - - if [ $? -ne 0 ]; then - return 1 - fi + local ifname + + . /lib/functions/network.sh + + network_get_device ifname "wan" || return 1 + + /usr/sbin/dhclient -q -nw -6 -cf $config_file -lf $lease_file -pf $pid_file -sf $script_file $ifname + + [ $? -eq 0 ] || return 1 } stop() { - if [ ! -e $pid_file ]; then - return 1 - fi + [ -e $pid_file ] || return 1 + + kill -9 $(cat $pid_file) - kill -9 `cat $pid_file` + [ $? -eq 0 ] || return 1 - if [ $? -ne 0 ]; then - return 1 - fi - rm $pid_file } -- cgit v1.2.3