mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
Update luci-base to latest version
This commit is contained in:
Ycarus
parent
75c70fa721
commit
b108aa9789
39 changed files with 2518 additions and 693 deletions
|
|
@ -1273,7 +1273,7 @@ function interface.get_i18n(self)
|
|||
return "%s: %s %q" %{
|
||||
lng.translate("Wireless Network"),
|
||||
self.wif:active_mode(),
|
||||
self.wif:active_ssid() or self.wif:active_bssid() or self.wif:id()
|
||||
self.wif:active_ssid() or self.wif:active_bssid() or self.wif:id() or "?"
|
||||
}
|
||||
else
|
||||
return "%s: %q" %{ self:get_type_i18n(), self:name() }
|
||||
|
|
@ -1428,7 +1428,7 @@ function wifidev.hwmodes(self)
|
|||
end
|
||||
|
||||
function wifidev.get_i18n(self)
|
||||
local t = "Generic"
|
||||
local t = self.iwinfo.hardware_name or "Generic"
|
||||
if self.iwinfo.type == "wl" then
|
||||
t = "Broadcom"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -143,22 +143,85 @@ function commit(self, config)
|
|||
return (err == nil), ERRSTR[err]
|
||||
end
|
||||
|
||||
--[[
|
||||
function apply(self, configs, command)
|
||||
local _, config
|
||||
function apply(self, rollback)
|
||||
local _, err
|
||||
|
||||
assert(not command, "Apply command not supported anymore")
|
||||
if rollback then
|
||||
local conf = require "luci.config"
|
||||
local timeout = tonumber(conf and conf.apply and conf.apply.rollback or "") or 0
|
||||
|
||||
if type(configs) == "table" then
|
||||
for _, config in ipairs(configs) do
|
||||
call("service", "event", {
|
||||
type = "config.change",
|
||||
data = { package = config }
|
||||
_, err = call("apply", {
|
||||
timeout = (timeout > 30) and timeout or 30,
|
||||
rollback = true
|
||||
})
|
||||
|
||||
if not err then
|
||||
util.ubus("session", "set", {
|
||||
ubus_rpc_session = session_id,
|
||||
values = { rollback = os.time() + timeout }
|
||||
})
|
||||
end
|
||||
else
|
||||
_, err = call("changes", {})
|
||||
|
||||
if not err then
|
||||
if type(_) == "table" and type(_.changes) == "table" then
|
||||
local k, v
|
||||
for k, v in pairs(_.changes) do
|
||||
_, err = call("commit", { config = k })
|
||||
if err then
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if not err then
|
||||
_, err = call("apply", { rollback = false })
|
||||
end
|
||||
end
|
||||
|
||||
return (err == nil), ERRSTR[err]
|
||||
end
|
||||
|
||||
function confirm(self)
|
||||
local _, err = call("confirm", {})
|
||||
if not err then
|
||||
util.ubus("session", "set", {
|
||||
ubus_rpc_session = session_id,
|
||||
values = { rollback = 0 }
|
||||
})
|
||||
end
|
||||
return (err == nil), ERRSTR[err]
|
||||
end
|
||||
|
||||
function rollback(self)
|
||||
local _, err = call("rollback", {})
|
||||
if not err then
|
||||
util.ubus("session", "set", {
|
||||
ubus_rpc_session = session_id,
|
||||
values = { rollback = 0 }
|
||||
})
|
||||
end
|
||||
return (err == nil), ERRSTR[err]
|
||||
end
|
||||
|
||||
function rollback_pending(self)
|
||||
local deadline, err = util.ubus("session", "get", {
|
||||
ubus_rpc_session = session_id,
|
||||
keys = { "rollback" }
|
||||
})
|
||||
|
||||
if type(deadline) == "table" and
|
||||
type(deadline.values) == "table" and
|
||||
type(deadline.values.rollback) == "number" and
|
||||
deadline.values.rollback > os.time()
|
||||
then
|
||||
return true, deadline.values.rollback - os.time()
|
||||
end
|
||||
|
||||
return false, ERRSTR[err]
|
||||
end
|
||||
]]
|
||||
|
||||
|
||||
function foreach(self, config, stype, callback)
|
||||
|
|
@ -425,59 +488,3 @@ function delete_all(self, config, stype, comparator)
|
|||
|
||||
return (err == nil), ERRSTR[err]
|
||||
end
|
||||
|
||||
|
||||
function apply(self, configlist, command)
|
||||
configlist = self:_affected(configlist)
|
||||
if command then
|
||||
return { "/sbin/luci-reload", unpack(configlist) }
|
||||
else
|
||||
return os.execute("/sbin/luci-reload %s >/dev/null 2>&1"
|
||||
% util.shellquote(table.concat(configlist, " ")))
|
||||
end
|
||||
end
|
||||
|
||||
-- Return a list of initscripts affected by configuration changes.
|
||||
function _affected(self, configlist)
|
||||
configlist = type(configlist) == "table" and configlist or { configlist }
|
||||
|
||||
-- Resolve dependencies
|
||||
local reloadlist = { }
|
||||
|
||||
local function _resolve_deps(name)
|
||||
local reload = { name }
|
||||
local deps = { }
|
||||
|
||||
self:foreach("ucitrack", name,
|
||||
function(section)
|
||||
if section.affects then
|
||||
for i, aff in ipairs(section.affects) do
|
||||
deps[#deps+1] = aff
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
local i, dep
|
||||
for i, dep in ipairs(deps) do
|
||||
local j, add
|
||||
for j, add in ipairs(_resolve_deps(dep)) do
|
||||
reload[#reload+1] = add
|
||||
end
|
||||
end
|
||||
|
||||
return reload
|
||||
end
|
||||
|
||||
-- Collect initscripts
|
||||
local j, config
|
||||
for j, config in ipairs(configlist) do
|
||||
local i, e
|
||||
for i, e in ipairs(_resolve_deps(config)) do
|
||||
if not util.contains(reloadlist, e) then
|
||||
reloadlist[#reloadlist+1] = e
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return reloadlist
|
||||
end
|
||||
|
|
|
|||
|
|
@ -28,12 +28,63 @@ Create a new Cursor initialized to the state directory.
|
|||
]]
|
||||
|
||||
---[[
|
||||
Applies UCI configuration changes
|
||||
Applies UCI configuration changes.
|
||||
|
||||
If the rollback parameter is set to true, the apply function will invoke the
|
||||
rollback mechanism which causes the configuration to be automatically reverted
|
||||
if no confirm() call occurs within a certain timeout.
|
||||
|
||||
The current default timeout is 30s and can be increased using the
|
||||
"luci.apply.timeout" uci configuration key.
|
||||
|
||||
@class function
|
||||
@name Cursor.apply
|
||||
@param configlist List of UCI configurations
|
||||
@param command Don't apply only return the command
|
||||
@param rollback Enable rollback mechanism
|
||||
@return Boolean whether operation succeeded
|
||||
]]
|
||||
|
||||
---[[
|
||||
Confirms UCI apply process.
|
||||
|
||||
If a previous UCI apply with rollback has been invoked using apply(true),
|
||||
this function confirms the process and cancels the pending rollback timer.
|
||||
|
||||
If no apply with rollback session is active, the function has no effect and
|
||||
returns with a "No data" error.
|
||||
|
||||
@class function
|
||||
@name Cursor.confirm
|
||||
@return Boolean whether operation succeeded
|
||||
]]
|
||||
|
||||
---[[
|
||||
Cancels UCI apply process.
|
||||
|
||||
If a previous UCI apply with rollback has been invoked using apply(true),
|
||||
this function cancels the process and rolls back the configuration to the
|
||||
pre-apply state.
|
||||
|
||||
If no apply with rollback session is active, the function has no effect and
|
||||
returns with a "No data" error.
|
||||
|
||||
@class function
|
||||
@name Cursor.rollback
|
||||
@return Boolean whether operation succeeded
|
||||
]]
|
||||
|
||||
---[[
|
||||
Checks whether a pending rollback is scheduled.
|
||||
|
||||
If a previous UCI apply with rollback has been invoked using apply(true),
|
||||
and has not been confirmed or rolled back yet, this function returns true
|
||||
and the remaining time until rollback in seconds. If no rollback is pending,
|
||||
the function returns false. On error, the function returns false and an
|
||||
additional string describing the error.
|
||||
|
||||
@class function
|
||||
@name Cursor.rollback_pending
|
||||
@return Boolean whether rollback is pending
|
||||
@return Remaining time in seconds
|
||||
]]
|
||||
|
||||
---[[
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue