From: Jo-Philipp Wich Date: Fri, 27 Apr 2012 18:10:51 +0000 (+0000) Subject: protocols/ppp: fix install state detection with netifd X-Git-Tag: 0.11.0~695 X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=62ec28f0be1b951342e5770c80c4bc0bb7182622 protocols/ppp: fix install state detection with netifd --- diff --git a/protocols/ppp/luasrc/model/network/proto_ppp.lua b/protocols/ppp/luasrc/model/network/proto_ppp.lua index af6f39402..2988385b2 100644 --- 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) - 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)