projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf8b8f8
)
protocols/ppp: fix install state detection with netifd
author
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 27 Apr 2012 18:10:51 +0000
(18:10 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 27 Apr 2012 18:10:51 +0000
(18:10 +0000)
protocols/ppp/luasrc/model/network/proto_ppp.lua
patch
|
blob
|
history
diff --git
a/protocols/ppp/luasrc/model/network/proto_ppp.lua
b/protocols/ppp/luasrc/model/network/proto_ppp.lua
index
af6f394
..
2988385
100644
(file)
--- a/
protocols/ppp/luasrc/model/network/proto_ppp.lua
+++ b/
protocols/ppp/luasrc/model/network/proto_ppp.lua
@@
-55,7
+55,17
@@
for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g"}) do
end
function proto.is_installed(self)
end
function proto.is_installed(self)
- return nixio.fs.access("/lib/network/" .. p .. ".sh")
+ if nixio.fs.access("/lib/network/" .. p .. ".sh") then
+ return true
+ elseif p == "pppoa" then
+ 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 == "3g" then
+ return nixio.fs.access("/lib/netifd/proto/3g.sh")
+ else
+ return nixio.fs.access("/lib/netifd/proto/ppp.sh")
+ end
end
function proto.is_floating(self)
end
function proto.is_floating(self)