git.99rst.org
/
openwrt-luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
| inline |
side by side
(parent:
c10a738
)
luci-mod-admin-full: status: survive broken DSL status output
author
Jo-Philipp Wich
<redacted>
Sat, 3 Oct 2015 14:11:11 +0000
(16:11 +0200)
committer
Jo-Philipp Wich
<redacted>
Sat, 3 Oct 2015 14:11:14 +0000
(16:11 +0200)
Only attempt to call "dsl_func" if the dsl_control lucistat output could be
successfully evaluated.
Works around https://dev.openwrt.org/ticket/20607
Signed-off-by: Jo-Philipp Wich <redacted>
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
patch
|
blob
|
history
diff --git
a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index 07a96b2bf015f5f0131d9bdd4ca9d65455d0c23a..a98d790802a099b87382c6568b9709048d234075 100644
(file)
--- a/
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@
-88,7
+88,9
@@
if has_dsl then
local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat")
local dsl_func = loadstring(dsl_stat)
- rv.dsl = dsl_func()
+ if dsl_func then
+ rv.dsl = dsl_func()
+ end
end
luci.http.prepare_content("application/json")
git clone https://git.99rst.org/PROJECT