mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-01-28 03:37:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

odhcpd: remove legacy option

Browse source 
Support for this option has been removed from odhcpd, so remove it in
the defaults as well.

Signed-off-by: David Härdeman <david@hardeman.nu>
Link: https://github.com/openwrt/openwrt/pull/20673
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
David Härdeman 2025-11-05 09:46:31 +01:00 • committed by Álvaro Fernández Rojas
parent 0b9111301b
commit 9be4970581
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/services/odhcpd/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=odhcpd
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git

13
package/network/services/odhcpd/files/odhcpd.defaults
View file

@ -1,11 +1,20 @@
#!/bin/sh
if [ -n "$(uci -q get dhcp.odhcpd)" ]; then
local commit
commit=0
if [ -z "$(uci -q get dhcp.odhcpd.piofolder)" ]; then
uci set dhcp.odhcpd.piofolder=/tmp/odhcpd-piofolder
uci commit dhcp
commit=1
fi
if [ -n "$(uci -q get dhcp.odhcpd.legacy)" ]; then
uci delete dhcp.odhcpd.legacy
commit=1
fi
[ "$commit" -eq 1 ] && uci commit dhcp
exit 0
fi
@ -34,7 +43,7 @@ case "$protocol" in
;;
esac
uci get dhcp.lan 1>/dev/null 2>/dev/null || {
uci -q get dhcp.lan || {
uci batch <<EOF
set dhcp.lan=dhcp
set dhcp.lan.interface='lan'