From 4b07afe59f4a45f7d755e9fd29346ba482d522ba Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 2 Mar 2022 15:10:58 +0100 Subject: [PATCH] ucentral-schema: update to latest HEAD 19fcc8d update schemareader bef2a8f state: add the upstream dhcp servers ip to the state message Signed-off-by: John Crispin --- feeds/ucentral/ucentral-schema/Makefile | 3 +- ...nterfaces-store-the-dhcp-server-in-i.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 patches/backports/0033-netifd-on-dhcp-interfaces-store-the-dhcp-server-in-i.patch diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index 255dfa24e..85fcd208a 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -4,10 +4,9 @@ PKG_NAME:=ucentral-schema PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git -PKG_MIRROR_HASH:=b57d71fc7e9ef00b3f83f15e340a193942e51ddee40c989f5a2a905acedd400c PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-01-17 -PKG_SOURCE_VERSION:=ba4189713bd16f7916d4b791920d5444465a55f3 +PKG_SOURCE_VERSION:=19fcc8d8163e84734d34dc7dd9767c2fa133fa16 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause diff --git a/patches/backports/0033-netifd-on-dhcp-interfaces-store-the-dhcp-server-in-i.patch b/patches/backports/0033-netifd-on-dhcp-interfaces-store-the-dhcp-server-in-i.patch new file mode 100644 index 000000000..ec97b916e --- /dev/null +++ b/patches/backports/0033-netifd-on-dhcp-interfaces-store-the-dhcp-server-in-i.patch @@ -0,0 +1,30 @@ +From a3598bcbc83224faf0d2ecb55761d048a1beb6d1 Mon Sep 17 00:00:00 2001 +From: Felix Fietkau +Date: Fri, 10 Dec 2021 10:16:18 +0100 +Subject: [PATCH] netifd: on dhcp interfaces, store the dhcp server in + interface data + +Among other things, this can be used to auto-configure the DHCP server +address for wireless APs using FILS, if the bridged interface is +configured to DHCP + +Signed-off-by: Felix Fietkau +--- + package/network/config/netifd/files/lib/netifd/dhcp.script | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script +index e46005d84c..6fcf139beb 100755 +--- a/package/network/config/netifd/files/lib/netifd/dhcp.script ++++ b/package/network/config/netifd/files/lib/netifd/dhcp.script +@@ -60,6 +60,7 @@ setup_interface () { + [ -n "$message" ] && json_add_string message "$message" + [ -n "$timezone" ] && json_add_int timezone "$timezone" + [ -n "$lease" ] && json_add_int leasetime "$lease" ++ [ -n "$serverid" ] && json_add_string dhcpserver "$serverid" + proto_close_data + + proto_send_update "$INTERFACE" +-- +2.25.1 +