From 2950cc3f596d5565390aaa1188cdb67d2401840b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 24 Jan 2018 21:20:30 +0100 Subject: [PATCH] gluon-core: only use a bridge for wired meshing when necessary On most devices, there is only a single LAN interface connected to all LAN ports, so no bridge is necessary. --- .../gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan b/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan index 8bde35de..4bf56e7a 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan @@ -14,13 +14,18 @@ local old_proto = uci:get('network', 'mesh_lan', 'proto') uci:section('network', 'interface', 'mesh_lan', { ifname = sysconfig.lan_ifname, - type = 'bridge', igmp_snooping = false, proto = 'gluon_wired', index = 4, legacy = old_proto == 'gluon_mesh', }) +if sysconfig.lan_ifname:match(' ') then + uci:set('network', 'mesh_lan', 'type', 'bridge') +else + uci:delete('network', 'mesh_lan', 'type') +end + local enable = site.mesh_on_lan(false) local old_auto = uci:get('network', 'mesh_lan', 'auto') local old_disabled = uci:get('network', 'mesh_lan', 'disabled')