Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #21666 from pprindeville/isc-dhcp-drop-uci_get_state

Browse source 
isc-dhcp: deprecate use of uci_get_state in client scripts
This commit is contained in:
Philip Prindeville 2023-07-26 17:48:41 -06:00 committed by GitHub
commit 17770aa222
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/isc-dhcp/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=isc-dhcp
UPSTREAM_NAME:=dhcp
PKG_VERSION:=4.4.3-P1
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE

24
net/isc-dhcp/files/dhclient.init
View file

@ -8,23 +8,23 @@ pid_file=/var/run/dhclient.pid
script_file=/usr/sbin/dhclient-script
start() {
/usr/sbin/dhclient -q -nw -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 -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)
if [ $? -ne 0 ]; then
return 1
fi
[ $? -eq 0 ] || return 1
rm $pid_file
}

26
net/isc-dhcp/files/dhclient6.init
View file

@ -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
}