From 924675d271dd53a9f4877071337ec91a1884a617 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 28 Oct 2025 15:29:17 +0530
Subject: [PATCH] netmode: 1.1.8

---
 netmode/Makefile                                       |  2 +-
 .../etc/uci-defaults/40_netmode_set_default_netmode    | 10 ++++++++--
 netmode/files/lib/upgrade/keep.d/netmode               |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 netmode/files/lib/upgrade/keep.d/netmode

diff --git a/netmode/Makefile b/netmode/Makefile
index 5021e29e5..2ddc779f3 100644
--- a/netmode/Makefile
+++ b/netmode/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=1.1.7
+PKG_VERSION:=1.1.8
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
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 8dc83e303..c38a30bd5 100644
--- a/netmode/files/etc/uci-defaults/40_netmode_set_default_netmode
+++ b/netmode/files/etc/uci-defaults/40_netmode_set_default_netmode
@@ -4,13 +4,19 @@ enabled="$(uci -q get netmode.global.enabled)"
 [ "$enabled" == "1" ] || exit 0
 
 mode="$(uci -q get netmode.global.mode)"
-[ -n "$mode" ] && exit 0
+wanproto=$(uci -q get network.wan.proto)
+
+if [ -n "$mode" ]; then
+	# check if wanproto and mode aligned
+	if [ "${mode}" = "routed-${wanproto}" ]; then
+		exit 0
+	fi
+fi
 
 [ -f /etc/netmodes/supported_modes.json ] || exit 0
 
 # NetMode is enabled without a Mode being set
 # Figure out the current mode from network config
-wanproto=$(uci -q get network.wan.proto)
 curmode=""
 case "$wanproto" in
 	dhcp) curmode="routed-dhcp" ;;
diff --git a/netmode/files/lib/upgrade/keep.d/netmode b/netmode/files/lib/upgrade/keep.d/netmode
new file mode 100644
index 000000000..dd1186afa
--- /dev/null
+++ b/netmode/files/lib/upgrade/keep.d/netmode
@@ -0,0 +1 @@
+/etc/netmodes/.last_mode