summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDirk Brenken <dev@brenken.org>2018-03-22 09:19:51 +0100
committerDirk Brenken <dev@brenken.org>2018-03-22 10:40:42 +0100
commit29d8770983674f161aac390a73b74c3c2318f38f (patch)
tree6481a396d4f482cac28e02cb001b62397b295a83
parentb254e329c6f4d96fce2b8b07ac0a9445e49d1958 (diff)
luci-base/util.lua: enhance checklib function
* enhance the checklib function in util.lua to check the 'fullpathexe' as well, e.g. this fixes runtime errors on the dhcp/dns template in environments without dnsmasq Signed-off-by: Dirk Brenken <dev@brenken.org>
-rw-r--r--modules/luci-base/luasrc/util.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/luci-base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua
index 0e7334be8..28c126621 100644
--- a/modules/luci-base/luasrc/util.lua
+++ b/modules/luci-base/luasrc/util.lua
@@ -652,7 +652,8 @@ end
function checklib(fullpathexe, wantedlib)
local fs = require "nixio.fs"
local haveldd = fs.access('/usr/bin/ldd')
- if not haveldd then
+ local haveexe = fs.access(fullpathexe)
+ if not haveldd or not haveexe then
return false
end
local libs = exec("/usr/bin/ldd " .. fullpathexe)