From ecf76ddb06f70d7ba5cfad26565030d0aca4c8d7 Mon Sep 17 00:00:00 2001 From: Rahul Thakur Date: Tue, 2 May 2023 10:41:51 +0530 Subject: [PATCH] mcastmngr: fix uci config changes get overwritten --- .../files/common/etc/uci-defaults/61-mcast_config_generate | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate b/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate index 5b7e13dcb..515d37b59 100644 --- a/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate +++ b/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate @@ -95,8 +95,13 @@ interfaces_ok(){ dev_section=$(ubus call uci get '{"config":"network", "type":"device", "match":{"name":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[]) # mcast config is outdated, simply generate as per new logic - [ -z "$dev_section" ] && return 1 + if [ -z "$dev_section" ]; then + # check if the itf is a native interface && return 1 + native=$(ubus call uci get '{"config":"ports", "type":"ethport", "match":{"ifname":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[]) + [ -z "native" ] && return 1 + fi done + return 0 }