From e76d6d720cbf954af5d76192b47b5d3643ae129f Mon Sep 17 00:00:00 2001 From: ntlf9t <31321865+ntlf9t@users.noreply.github.com> Date: Thu, 21 Oct 2021 11:03:20 +0800 Subject: [PATCH] update easymesh v1.8 (#8094) Co-authored-by: ntlf9t --- package/lean/luci-app-easymesh/Makefile | 2 +- .../luci-app-easymesh/po/zh-cn/easymesh.po | 24 +++++++++++++++++++ .../root/etc/init.d/easymesh | 12 +++++----- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/package/lean/luci-app-easymesh/Makefile b/package/lean/luci-app-easymesh/Makefile index 96fc94c27..e0ecd0a63 100755 --- a/package/lean/luci-app-easymesh/Makefile +++ b/package/lean/luci-app-easymesh/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for easymesh LUCI_DEPENDS:= +kmod-cfg80211 +batctl-default +kmod-batman-adv +wpad-openssl +dawn -PKG_VERSION:=1.7 +PKG_VERSION:=1.8 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-easymesh/po/zh-cn/easymesh.po b/package/lean/luci-app-easymesh/po/zh-cn/easymesh.po index ade62b5ea..9d70914a7 100755 --- a/package/lean/luci-app-easymesh/po/zh-cn/easymesh.po +++ b/package/lean/luci-app-easymesh/po/zh-cn/easymesh.po @@ -45,3 +45,27 @@ msgstr "加密" msgid "Key" msgstr "密码" + +msgid "Threshold for an good RSSI" +msgstr "快速漫游接入值" + +msgid "Threshold for an bad RSSI" +msgstr "快速漫游踢出值" + +msgid "AP MODE Enable" +msgstr "启用AP模式" + +msgid "Enable or disable AP MODE" +msgstr "启用或禁用AP模式" + +msgid "IPv4-Address" +msgstr "IPv4 地址" + +msgid "IPv4 netmask" +msgstr "IPv4 子网掩码" + +msgid "IPv4 gateway" +msgstr "IPv4 网关" + +msgid "Use custom DNS servers" +msgstr "使用自定义的 DNS 服务器" \ No newline at end of file diff --git a/package/lean/luci-app-easymesh/root/etc/init.d/easymesh b/package/lean/luci-app-easymesh/root/etc/init.d/easymesh index e19567522..1a9dd5907 100755 --- a/package/lean/luci-app-easymesh/root/etc/init.d/easymesh +++ b/package/lean/luci-app-easymesh/root/etc/init.d/easymesh @@ -12,8 +12,8 @@ ipaddr=$(uci get easymesh.config.ipaddr 2>/dev/null) netmask=$(uci get easymesh.config.netmask 2>/dev/null) gateway=$(uci get easymesh.config.gateway 2>/dev/null) ap_gateway=$(uci get network.lan.gateway 2>/dev/null) -ap_gateway1=$(cat /etc/easymesh | sed -n '1p') -dns1=$(cat /etc/easymesh | sed -n '2p') +ap_gateway1=$(cat /etc/easymesh | sed -n '1p' 2>/dev/null) +dns1=$(cat /etc/easymesh | sed -n '2p' 2>/dev/null) dns=$(uci get easymesh.config.dns 2>/dev/null) mesh_id=$(uci get easymesh.config.mesh_id 2>/dev/null) apRadio=$(uci get easymesh.config.apRadio 2>/dev/null) @@ -130,12 +130,12 @@ start(){ uci set ${wifiiface}.ft_over_ds='1' uci set ${wifiiface}.ft_psk_generate_local='1' uci commit network - - uci set dawn.@metric[0].rssi_val=$rssi_val - uci set dawn.@metric[0].low_rssi_val=$low_rssi_val - uci commit dawn fi done + + uci set dawn.@metric[0].rssi_val=$rssi_val + uci set dawn.@metric[0].low_rssi_val=$low_rssi_val + uci commit dawn /etc/init.d/dawn enable && /etc/init.d/dawn start else kvr_stop