From fdc0783b887b7c9289c3fc9063a538bacf66001c Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 17 Apr 2016 12:10:24 +0300 Subject: [PATCH] luci-base: read odhcpd leasefile location via uci Check the location of the odhcpd leasefile from /etc/config/dhcp via uci. Fallback to the default location. This fixes #702 Signed-off-by: Hannu Nyman (cherry picked from commit 51a7f96877d8c5bf70217073ed8aa7ab6a196d20) --- modules/luci-base/luasrc/tools/status.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/luci-base/luasrc/tools/status.lua b/modules/luci-base/luasrc/tools/status.lua index 0dd092c6d..1e6e69c5d 100644 --- a/modules/luci-base/luasrc/tools/status.lua +++ b/modules/luci-base/luasrc/tools/status.lua @@ -48,7 +48,15 @@ local function dhcp_leases_common(family) fd:close() end - local fd = io.open("/tmp/hosts/odhcpd", "r") + local lease6file = "/tmp/hosts/odhcpd" + uci:foreach("dhcp", "odhcpd", + function(t) + if t.leasefile and nfs.access(t.leasefile) then + lease6file = t.leasefile + return false + end + end) + local fd = io.open(lease6file, "r") if fd then while true do local ln = fd:read("*l") -- 2.25.1