diff options
| author | Florian Eckert <fe@dev.tdt.de> | 2018-03-15 10:21:05 +0100 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2018-05-28 22:28:30 +0800 |
| commit | f6aec9fe2161def3a996023353da8ffeadeeb691 (patch) | |
| tree | 90e4c9e7aefe321dd8406d03623f315710ff9db0 /protocols/luci-proto-ppp/luasrc/model/network | |
| parent | a013967e6ba16fb6faf063e4194886a11908c9ee (diff) | |
luci-proto-3g: make it a self-contained package
The follow error will appear after clicking "Switch protcol" to 3g when
luci-proto-3g was not installed. Fix this by moving the relevant parts
from luci-proto-ppp into luci-proto-3g and making it complete as a
single protocol handler
> Missing protocol extension for proto "3g"
> cannot open /usr/lib/lua/luci/model/cbi/admin_network/proto_3g.lua: No such file or directory
Closes openwrt/luci#1815
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'protocols/luci-proto-ppp/luasrc/model/network')
| -rw-r--r-- | protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua index 1bcbd4808a..3afb7de4f5 100644 --- a/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua +++ b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua @@ -4,7 +4,7 @@ local netmod = luci.model.network local _, p -for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g", "l2tp", "pppossh"}) do +for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "l2tp", "pppossh"}) do local proto = netmod:register_protocol(p) @@ -13,8 +13,6 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g", "l2tp", "pppossh"}) d return luci.i18n.translate("PPP") elseif p == "pptp" then return luci.i18n.translate("PPtP") - elseif p == "3g" then - return luci.i18n.translate("UMTS/GPRS/EV-DO") elseif p == "pppoe" then return luci.i18n.translate("PPPoE") elseif p == "pppoa" then @@ -33,8 +31,6 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g", "l2tp", "pppossh"}) d function proto.opkg_package(self) if p == "ppp" then return p - elseif p == "3g" then - return "comgt" elseif p == "pptp" then return "ppp-mod-pptp" elseif p == "pppoe" then @@ -55,8 +51,6 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g", "l2tp", "pppossh"}) d return (nixio.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")() ~= nil) elseif p == "pptp" then return (nixio.fs.glob("/usr/lib/pppd/*/pptp.so")() ~= nil) - elseif p == "3g" then - return nixio.fs.access("/lib/netifd/proto/3g.sh") elseif p == "l2tp" then return nixio.fs.access("/lib/netifd/proto/l2tp.sh") elseif p == "pppossh" then |