From f3406891b2b45ca3fd89c8306cb28ae05f5dd2cf Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 27 Jul 2023 12:24:23 +0200 Subject: [PATCH] ucentral-client: update to latest HEAD d898a7a prevent ip-collide script and apply task running in parallel Fixes: WIFI-12849 Signed-off-by: John Crispin --- feeds/ucentral/ucentral-client/Makefile | 4 ++-- .../files/etc/hotplug.d/iface/90-ip-collide | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/feeds/ucentral/ucentral-client/Makefile b/feeds/ucentral/ucentral-client/Makefile index c9ac74c8..477c31bf 100644 --- a/feeds/ucentral/ucentral-client/Makefile +++ b/feeds/ucentral/ucentral-client/Makefile @@ -4,10 +4,10 @@ PKG_NAME:=ucentral-client PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-client.git -PKG_MIRROR_HASH:=b9cd3bbc81ccd9eee373fa40f4ccf64fcdca2ab504fc2d94eb31d61f27f65986 +PKG_MIRROR_HASH:=208bc53ea0194a59ff4dc78c32033a393017b0b883aa4d7741595b61ad3a4fd3 PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-06-22 -PKG_SOURCE_VERSION:=feadd83436ae09dc48369417c4c7ab26d23d6097 +PKG_SOURCE_VERSION:=d898a7afb595d6c2350d38d027bf142e72060662 PKG_LICENSE:=BSD-3-Clause PKG_MAINTAINER:=John Crispin diff --git a/feeds/ucentral/ucentral-tools/files/etc/hotplug.d/iface/90-ip-collide b/feeds/ucentral/ucentral-tools/files/etc/hotplug.d/iface/90-ip-collide index 648791ba..b70ab18b 100644 --- a/feeds/ucentral/ucentral-tools/files/etc/hotplug.d/iface/90-ip-collide +++ b/feeds/ucentral/ucentral-tools/files/etc/hotplug.d/iface/90-ip-collide @@ -1 +1,8 @@ -[ ifup = "$ACTION" ] && /usr/share/ucentral/ip-collide.uc +[ ifup = "$ACTION" ] && { + ubus list ucentral + if [ $? -eq 0 ]; then + ubus call ucentral ip_collide + else + /usr/share/ucentral/ip-collide.uc + fi +}