diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua (renamed from protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua) | 0 | ||||
| -rw-r--r-- | protocols/ppp/luasrc/model/network/proto_ppp.lua | 6 | ||||
| -rw-r--r-- | protocols/pptp/Makefile | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua index fb8a9ac8a5..fb8a9ac8a5 100644 --- a/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua +++ b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua diff --git a/protocols/ppp/luasrc/model/network/proto_ppp.lua b/protocols/ppp/luasrc/model/network/proto_ppp.lua index b00c9f0a21..2dded366d6 100644 --- a/protocols/ppp/luasrc/model/network/proto_ppp.lua +++ b/protocols/ppp/luasrc/model/network/proto_ppp.lua @@ -43,10 +43,12 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g"}) do end function proto.opkg_package(self) - if p == "ppp" or p == "pptp" then + if p == "ppp" then return p elseif p == "3g" then return "comgt" + elseif p == "pptp" then + return "ppp-mod-pptp" elseif p == "pppoe" then return "ppp-mod-pppoe" elseif p == "pppoa" then @@ -59,6 +61,8 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g"}) do return (nixio.fs.glob("/usr/lib/pppd/*/pppoatm.so")() ~= nil) elseif p == "pppoe" then 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") else diff --git a/protocols/pptp/Makefile b/protocols/pptp/Makefile deleted file mode 100644 index f7fac7740e..0000000000 --- a/protocols/pptp/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -include ../../build/config.mk -include ../../build/module.mk |