diff --git a/luci-app-omr-quota/luasrc/model/cbi/quota/quota.lua b/luci-app-omr-quota/luasrc/model/cbi/quota/quota.lua index 20a6eb9f8..efe296fc0 100644 --- a/luci-app-omr-quota/luasrc/model/cbi/quota/quota.lua +++ b/luci-app-omr-quota/luasrc/model/cbi/quota/quota.lua @@ -4,7 +4,6 @@ local fs = require "nixio.fs" local net = require "luci.model.network".init() local sys = require "luci.sys" -local ifaces = sys.net:devices() m = Map("omr-quota", translate("Monthly Quota"), translate("Set monthly quota, when quota is reached interface state is set to down")) @@ -13,9 +12,9 @@ s.template_addremove = "omr-quota/cbi-select-add" s.addremove = true s.add_select_options = { } s.add_select_options[''] = '' -for _, iface in ipairs(ifaces) do - if not (iface == "lo" or iface:match("^ifb.*")) then - s.add_select_options[iface] = iface +for _, iface in ipairs(net:get_networks()) do + if not (iface:name() == "loopback") then + s.add_select_options[iface:name()] = iface:name() end end diff --git a/omr-quota/files/etc/init.d/omr-quota b/omr-quota/files/etc/init.d/omr-quota index 4883fe645..57b5a36d2 100755 --- a/omr-quota/files/etc/init.d/omr-quota +++ b/omr-quota/files/etc/init.d/omr-quota @@ -18,7 +18,7 @@ _validate_section() { _launch_quota() { local txquota rxquota ttquota interval enabled interface _validate_section "interface" "$1" - interface=$1 + interface=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]') [ -z "$txquota" ] && [ -z "$rxquota" ] && [ -z "$ttquota" ] && return [ "$enabled" = "0" ] && return