From 100b544f3be0ded52e03ff7c62001e8395d02045 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 31 May 2012 16:16:32 +0000 Subject: [PATCH] proto: fix feature detection of installed protocol handlers --- protocols/6x4/luasrc/model/network/proto_6x4.lua | 3 +-- protocols/ppp/luasrc/model/network/proto_ppp.lua | 4 +--- protocols/relay/luasrc/model/network/proto_relay.lua | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/protocols/6x4/luasrc/model/network/proto_6x4.lua b/protocols/6x4/luasrc/model/network/proto_6x4.lua index b9fbf64ec8..63735f6f8e 100644 --- a/protocols/6x4/luasrc/model/network/proto_6x4.lua +++ b/protocols/6x4/luasrc/model/network/proto_6x4.lua @@ -41,8 +41,7 @@ for _, p in ipairs({"6in4", "6to4"}) do end function proto.is_installed(self) - return nixio.fs.access("/lib/network/" .. p .. ".sh") or - nixio.fs.access("/lib/netifd/proto/" .. p .. ".sh") + return nixio.fs.access("/lib/netifd/proto/" .. p .. ".sh") end function proto.is_floating(self) diff --git a/protocols/ppp/luasrc/model/network/proto_ppp.lua b/protocols/ppp/luasrc/model/network/proto_ppp.lua index 2988385b22..b00c9f0a21 100644 --- a/protocols/ppp/luasrc/model/network/proto_ppp.lua +++ b/protocols/ppp/luasrc/model/network/proto_ppp.lua @@ -55,9 +55,7 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g"}) do end function proto.is_installed(self) - if nixio.fs.access("/lib/network/" .. p .. ".sh") then - return true - elseif p == "pppoa" then + if 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) diff --git a/protocols/relay/luasrc/model/network/proto_relay.lua b/protocols/relay/luasrc/model/network/proto_relay.lua index 03f6d6abf0..42bd1f846a 100644 --- a/protocols/relay/luasrc/model/network/proto_relay.lua +++ b/protocols/relay/luasrc/model/network/proto_relay.lua @@ -37,7 +37,7 @@ function proto.opkg_package(self) end function proto.is_installed(self) - return nixio.fs.access("/lib/network/relay.sh") + return nixio.fs.access("/etc/init.d/relayd") end function proto.is_floating(self) -- 2.30.2