Changeset 8657

Timestamp:

04/27/12 19:10:51 (13 months ago)

Author:

jow

Message:

protocols/ppp: fix install state detection with netifd

Files:

• luci/trunk/protocols/ppp/luasrc/model/network/proto_ppp.lua (modified) (1 diff)

luci/trunk/protocols/ppp/luasrc/model/network/proto_ppp.lua

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