From 1f9ba0a4fde531aaa46eb3b2a4b8a06e717de757 Mon Sep 17 00:00:00 2001
From: Sukru Senli <sukru.senli@inteno.se>
Date: Fri, 29 Dec 2017 19:30:06 +0100
Subject: [PATCH] inteno-netmodes: adapt to layer2 changes

---
 inteno-netmodes/files/etc/init.d/netmode | 2 ++
 inteno-netmodes/files/sbin/netmode-conf  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/inteno-netmodes/files/etc/init.d/netmode b/inteno-netmodes/files/etc/init.d/netmode
index 7d90569f4..16bcb15c4 100755
--- a/inteno-netmodes/files/etc/init.d/netmode
+++ b/inteno-netmodes/files/etc/init.d/netmode
@@ -235,6 +235,7 @@ switch_netmode() {
 		/etc/init.d/environment reload
 		case "$curmode" in
 			routed*)
+				[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
 				ubus call uci commit '{"config":"network"}'
 			;;
 			repeater*)
@@ -242,6 +243,7 @@ switch_netmode() {
 					/etc/init.d/omcproxy stop
 				fi
 				if [ "$netreload" != "0" ]; then
+					[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
 					ubus call uci commit '{"config":"network"}'
 				fi
 			;;
diff --git a/inteno-netmodes/files/sbin/netmode-conf b/inteno-netmodes/files/sbin/netmode-conf
index d83d61dd6..d1e12dd79 100755
--- a/inteno-netmodes/files/sbin/netmode-conf
+++ b/inteno-netmodes/files/sbin/netmode-conf
@@ -251,7 +251,7 @@ uci commit wireless
 if [ "$from_gui" == "true" ]; then
 	# check for connectivity
 	wifi reload
-	[ -f /etc/init.d/layer2_interface_ethernet -a -f /etc/config/layer2_interface_ethernet ] && /etc/init.d/layer2_interface_ethernet reload
+	[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
 	i=$SLEEPTIME;
 
 	while [ $i -gt 0 ]; do
@@ -283,6 +283,6 @@ else
 		# wifi reload
 		wifi reload
 	fi
-	[ -f /etc/init.d/layer2_interface_ethernet -a -f /etc/config/layer2_interface_ethernet ] && /etc/init.d/layer2_interface_ethernet reload
+	[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
 	ubus call leds set '{"state":"normal"}'
 fi