Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-system: ignore empty /proc/mtd on flash page

Browse source 
A present, but empty /proc/mtd causes validation on the flash page to fail,
preventing any other operation.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d2d3738d90)
This commit is contained in:
Jo-Philipp Wich 2020-07-22 10:20:42 +02:00
parent 91ac7214be
commit 8750495992
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
View file

@ -382,16 +382,21 @@ return view.extend({
o.onclick = L.bind(this.handleRestore, this);
if (procmtd.length) {
var mtdblocks = [];
procmtd.split(/\n/).forEach(function(ln) {
var match = ln.match(/^mtd(\d+): .+ "(.+?)"$/);
if (match)
mtdblocks.push(match[1], match[2]);
});
if (mtdblocks.length) {
o = s.option(form.SectionValue, 'actions', form.NamedSection, 'actions', 'actions', _('Save mtdblock contents'), _('Click "Save mtdblock" to download specified mtdblock file. (NOTE: THIS FEATURE IS FOR PROFESSIONALS! )'));
ss = o.subsection;
o = ss.option(form.ListValue, 'mtdselect', _('Choose mtdblock'));
procmtd.split(/\n/).forEach(function(ln) {
var match = ln.match(/^mtd(\d+): .+ "(.+?)"$/);
if (match)
o.value(match[1], match[2]);
});
for (var i = 0; i < mtdblocks.length; i += 2)
o.value(mtdblocks[i], mtdblocks[i+1]);
o = ss.option(form.Button, 'mtddownload', _('Download mtdblock'));
o.inputstyle = 'action important';