diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-11-14 20:50:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 20:50:03 +0100 |
| commit | ceb342dc8de0235686bfceae7cd3948cb3c2f527 (patch) | |
| tree | f8f68ad60960d8e8575d7fa8be4a69b1c77e34d5 /applications/luci-app-olsr/luasrc/model/cbi | |
| parent | e442bfe0ae51bd381045221391831703aa8fa182 (diff) | |
| parent | 5fd51f05a8f6bf7da7247c8c568080db625efa96 (diff) | |
Merge pull request #2259 from pmelange/luci-app-olsr-new-json-lib
update luci-app-olsr to the new jsoninfo library
Diffstat (limited to 'applications/luci-app-olsr/luasrc/model/cbi')
| -rw-r--r-- | applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua | 1 | ||||
| -rw-r--r-- | applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua index 2d7cffe6e9..59e99c867f 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua @@ -227,6 +227,7 @@ else -- create a loadplugin section for each found plugin for v in fs.dir("/usr/lib") do if v:sub(1, 6) == "olsrd_" then + v = string.match(v, "^(olsrd.*)%.so%..*") if not plugins[v] then mpi.uci:section( "olsrd", "LoadPlugin", nil, diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua index 12fa0a171e..9873b0269a 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua @@ -227,6 +227,7 @@ else -- create a loadplugin section for each found plugin for v in fs.dir("/usr/lib") do if v:sub(1, 6) == "olsrd_" then + v=string.match(v, "^(olsrd_.*)%.so%..*") if not plugins[v] then mpi.uci:section( "olsrd6", "LoadPlugin", nil, |