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

Merge pull request #21410 from pprindeville/isc-dhcp-dont-require-pools

Browse source 
isc-dhcp: don't require subnet pools
This commit is contained in:
Philip Prindeville 2023-06-27 15:48:38 -06:00 committed by GitHub
commit 3522e9b89a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 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 PKG_NAME:=isc-dhcp
UPSTREAM_NAME:=dhcp UPSTREAM_NAME:=dhcp
PKG_VERSION:=4.4.3-P1 PKG_VERSION:=4.4.3-P1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

13
net/isc-dhcp/files/dhcpd.init
View file

@ -369,7 +369,9 @@ gen_dhcp_subnet() {
local cfg="$1" local cfg="$1"
echo "subnet $NETWORK netmask $NETMASK {" echo "subnet $NETWORK netmask $NETMASK {"
echo " range $START $END;" if [ -n "$START" ] && [ -n "$END" ]; then
echo " range $START $END;"
fi
echo " option subnet-mask $netmask;" echo " option subnet-mask $netmask;"
if [ "$BROADCAST" != "0.0.0.0" ] ; then if [ "$BROADCAST" != "0.0.0.0" ] ; then
echo " option broadcast-address $BROADCAST;" echo " option broadcast-address $BROADCAST;"
@ -408,10 +410,13 @@ dhcpd_add() {
[ -n "$net" ] || return 0 [ -n "$net" ] || return 0
config_get start "$cfg" "start" config_get start "$cfg" "start"
[ -n "$start" ] || return 0
config_get limit "$cfg" "limit" config_get limit "$cfg" "limit"
[ -n "$limit" ] || return 0
case "$start:$limit" in
":*"|"*:")
echo "dhcpd: start/limit must be used together in $cfg" >&2
return 0
esac
network_get_subnet subnet "$net" || return 0 network_get_subnet subnet "$net" || return 0
network_get_device ifname "$net" || return 0 network_get_device ifname "$net" || return 0