Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

protocols: merge pptp into ppp, adjust depends for kernel mode pptp

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-06-11 22:41:32 +00:00
parent 7c72d241fa
commit 7add578817
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/package/luci/Makefile
View file

@ -212,10 +212,9 @@ define protocol
endef
$(eval $(call protocol,core,Support for static/dhcp/none))
$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA))
$(eval $(call protocol,pptp,Support for PPtP,+pptp))
$(eval $(call protocol,6x4,Support for 6in4/6to4,+6in4 +6to4))
$(eval $(call protocol,3g,Support for 3G,+comgt))
$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP))
$(eval $(call protocol,6x4,Support for 6in4/6to4,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4))
$(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt))
$(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd))

0
protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua → protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
View file

6
protocols/ppp/luasrc/model/network/proto_ppp.lua
View file

@ -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

2
protocols/pptp/Makefile
View file

@ -1,2 +0,0 @@
include ../../build/config.mk
include ../../build/module.mk