From 4727a315cad96b3173b4e4f53bd070d10f29e0fc Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Fri, 5 Dec 2025 17:19:36 +0100 Subject: [PATCH] netmode: fallback to checking usr_data if /opconf/opconf.json is not available --- .../files/etc/uci-defaults/40_netmode_set_default_netmode | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/netmode/files/etc/uci-defaults/40_netmode_set_default_netmode b/netmode/files/etc/uci-defaults/40_netmode_set_default_netmode index 02069c9f9..4b4e14ee1 100644 --- a/netmode/files/etc/uci-defaults/40_netmode_set_default_netmode +++ b/netmode/files/etc/uci-defaults/40_netmode_set_default_netmode @@ -5,15 +5,18 @@ if [ "$enabled" != "1" ]; then exit 0 fi +opconf_file="/opconf/opconf.json" +[ -f $opconf_file ] || opconf_file="/usr_data/opconf/opconf.json" + # Check if netmode getting provisioned from opconf, in case of opconf # provisioning, mode setting not required -mode="$(jsonfilter -i /opconf/opconf.json -e @.netmode.mode 2>/dev/null)" +mode="$(jsonfilter -i $opconf_file -e @.netmode.mode 2>/dev/null)" if [ -n "${mode}" ]; then exit 0 fi # Check if opconf has wan provisioning enabled, if yes, get the proto/mode from opconf -proto="$(jsonfilter -i /usr_data/opconf/opconf.json -e '@.network.wan[@.name="wan"].proto' 2>/dev/null)" +proto="$(jsonfilter -i $opconf_file -e '@.network.wan[@.name="wan"].proto' 2>/dev/null)" if [ -n "${proto}" ]; then mode="routed-${proto}" uci -q set netmode.global.mode="${mode}"