diff --git a/package/gluon-mesh-batman-adv-14/Makefile b/package/gluon-mesh-batman-adv-14/Makefile
index 504d7c2fe62ab04046cff2cfe63f16ce82c5107b..aa53e85fbed34122d2b135f39bc4a813ce775855 100644
--- a/package/gluon-mesh-batman-adv-14/Makefile
+++ b/package/gluon-mesh-batman-adv-14/Makefile
@@ -24,12 +24,10 @@ define Build/Configure
endef
define Build/Compile
- $(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-mesh-batman-adv-14/install
$(CP) ./files/* $(1)/
- $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
endef
$(eval $(call BuildPackage,gluon-mesh-batman-adv-14))
diff --git a/package/gluon-mesh-batman-adv-14/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14 b/package/gluon-mesh-batman-adv-14/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
deleted file mode 100755
index 30e2682b5b4ae23448eaeb5e39a82ffde29e3d8c..0000000000000000000000000000000000000000
--- a/package/gluon-mesh-batman-adv-14/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/lua
-
-local site = require 'gluon.site_config'
-
-local uci = require('luci.model.uci').cursor()
-
-
-local function configure_mtu(radio, config, mtu)
- if config.ibss then
- local network = 'ibss_' .. radio
-
- if config.ibss.vlan then
- uci:set('network', network, 'mtu', mtu + 4)
- uci:set('network', network .. '_vlan', 'mtu', mtu)
- else
- uci:set('network', network, 'mtu', mtu)
- end
- end
-
- if config.mesh then
- uci:set('network', 'mesh_' .. radio, 'mtu', mtu)
- end
-end
-
-
-local radios = {}
-
-uci:foreach('wireless', 'wifi-device',
- function(s)
- table.insert(radios, s['.name'])
- end
-)
-
-local mtu = 1528
-
-for _, radio in ipairs(radios) do
- local hwmode = uci:get('wireless', radio, 'hwmode')
-
- if hwmode == '11g' or hwmode == '11ng' then
- configure_mtu(radio, site.wifi24, mtu)
- elseif hwmode == '11a' or hwmode == '11na' then
- configure_mtu(radio, site.wifi5, mtu)
- end
-end
-
-
-uci:save('network')
diff --git a/package/gluon-mesh-batman-adv-15/Makefile b/package/gluon-mesh-batman-adv-15/Makefile
index d07d28325ec00e3b280dc37f11e115eca2402495..d64fea88af071e8fc2f71c20e3e3fb307a559ff8 100644
--- a/package/gluon-mesh-batman-adv-15/Makefile
+++ b/package/gluon-mesh-batman-adv-15/Makefile
@@ -24,12 +24,10 @@ define Build/Configure
endef
define Build/Compile
- $(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
define Package/gluon-mesh-batman-adv-15/install
$(CP) ./files/* $(1)/
- $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
endef
$(eval $(call BuildPackage,gluon-mesh-batman-adv-15))
diff --git a/package/gluon-mesh-batman-adv-15/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15 b/package/gluon-mesh-batman-adv-15/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
deleted file mode 100755
index 7148d42ce4a8313443225004add1801c6ed5c55a..0000000000000000000000000000000000000000
--- a/package/gluon-mesh-batman-adv-15/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/lua
-
-local site = require 'gluon.site_config'
-
-local uci = require('luci.model.uci').cursor()
-
-
-local function configure_mtu(radio, config, mtu)
- if config.ibss then
- local network = 'ibss_' .. radio
-
- if config.ibss.vlan then
- uci:set('network', network, 'mtu', mtu + 4)
- uci:set('network', network .. '_vlan', 'mtu', mtu)
- else
- uci:set('network', network, 'mtu', mtu)
- end
- end
-
- if config.mesh then
- uci:set('network', 'mesh_' .. radio, 'mtu', mtu)
- end
-end
-
-
-local radios = {}
-
-uci:foreach('wireless', 'wifi-device',
- function(s)
- table.insert(radios, s['.name'])
- end
-)
-
-local mtu = 1532
-
-for _, radio in ipairs(radios) do
- local hwmode = uci:get('wireless', radio, 'hwmode')
-
- if hwmode == '11g' or hwmode == '11ng' then
- configure_mtu(radio, site.wifi24, mtu)
- elseif hwmode == '11a' or hwmode == '11na' then
- configure_mtu(radio, site.wifi5, mtu)
- end
-end
-
-
-uci:save('network')
diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
index 217fbe6a797cbfcfe17852763a7549430e4d53fb..9e23eb393375c47462c2b00fcebb0f7929ea40a9 100755
--- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
+++ b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
@@ -48,15 +48,13 @@ local function configure_ibss(config, radio, index, suffix, disabled)
uci:section('network', 'interface', name .. '_vlan',
{
ifname = '@' .. name .. '.' .. config.vlan,
- proto = 'batadv',
- mesh = 'bat0',
+ proto = 'gluon_mesh',
}
)
else
uci:section('network', 'interface', name,
{
- proto = 'batadv',
- mesh = 'bat0',
+ proto = 'gluon_mesh',
}
)
end
@@ -95,8 +93,7 @@ local function configure_mesh(config, radio, index, suffix, disabled)
uci:section('network', 'interface', name,
{
- proto = 'batadv',
- mesh = 'bat0',
+ proto = 'gluon_mesh',
}
)
diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
index 7a964ee28080bd4ebf0c9ad5d793270d30a83e4a..eefa8d0fdda48169a6b42adfec55dcb9bdcc2566 100755
--- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
+++ b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
@@ -6,13 +6,13 @@ local uci = require 'luci.model.uci'
local c = uci.cursor()
if not c:get('network', 'mesh_wan') then
- c:section('network', 'interface', 'mesh_wan',
- { ifname = 'br-wan'
- , proto = 'batadv'
- , mesh = 'bat0'
- , mesh_no_rebroadcast = '1'
- , auto = site.mesh_on_wan and 1 or 0
- })
+ c:section('network', 'interface', 'mesh_wan', {
+ ifname = 'br-wan',
+ proto = 'gluon_mesh',
+ transitive = 1,
+ fixed_mtu = 1,
+ auto = site.mesh_on_wan and 1 or 0,
+ })
end
c:save('network')
diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
index 116944f84b38d5e3faf60e5026cc99eab3eb6b76..5df0090979c2c5f106c725a62bc0b35aea64ba0f 100755
--- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
+++ b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
@@ -12,13 +12,13 @@ if not sysconfig.lan_ifname then
end
uci:section('network', 'interface', 'mesh_lan', {
- ifname = sysconfig.lan_ifname,
- type = 'bridge',
+ ifname = sysconfig.lan_ifname,
+ type = 'bridge',
igmp_snooping = 0,
- proto = 'batadv',
- mesh = 'bat0',
- mesh_no_rebroadcast = '1',
- macaddr = util.get_mac(2),
+ proto = 'gluon_mesh',
+ transitive = 1,
+ fixed_mtu = 1,
+ macaddr = util.get_mac(2),
})
if uci:get('network', 'mesh_lan', 'auto') == nil then
diff --git a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
index e660db9eb2a832e19c07166045b047ba7e577f15..2fd35a1f664f64db98a859749a9f02c346244043 100755
--- a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
+++ b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
@@ -122,13 +122,13 @@ uci:save('fastd')
uci:section('network', 'interface', 'mesh_vpn',
- {
- ifname = 'mesh-vpn',
- proto = 'batadv',
- mesh = 'bat0',
- mesh_no_rebroadcast = 1,
- macaddr = util.get_mac(3),
- }
+ {
+ ifname = 'mesh-vpn',
+ proto = 'gluon_mesh',
+ transitive = 1,
+ fixed_mtu = 1,
+ macaddr = util.get_mac(3),
+ }
)
uci:save('network')