summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json1
-rw-r--r--modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js7
2 files changed, 2 insertions, 6 deletions
diff --git a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
index 182f249884..54caa74363 100644
--- a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
+++ b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
@@ -34,7 +34,6 @@
"/proc/mtd": [ "read" ],
"/proc/partitions": [ "read" ],
"/proc/sys/kernel/hostname": [ "read" ],
- "/sys/devices/virtual/mtd/*/name": [ "read" ],
"/sys/devices/virtual/ubi/*/name": [ "read" ]
},
"ubus": {
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
index 6f245533da..2309c82682 100644
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
@@ -215,7 +215,7 @@ var mapdata = { actions: {}, config: {} };
return L.view.extend({
load: function() {
- var max_mtd = 10, max_ubi = 2, max_ubi_vol = 4;
+ var max_ubi = 2, max_ubi_vol = 4;
var tasks = [
callFileStat('/lib/upgrade/platform.sh'),
callFileRead('/proc/sys/kernel/hostname'),
@@ -223,9 +223,6 @@ return L.view.extend({
callFileRead('/proc/partitions')
];
- for (var i = 0; i < max_mtd; i++)
- tasks.push(callFileRead('/sys/devices/virtual/mtd/mtd%d/name'.format(i)));
-
for (var i = 0; i < max_ubi; i++)
for (var j = 0; j < max_ubi_vol; j++)
tasks.push(callFileRead('/sys/devices/virtual/ubi/ubi%d/ubi%d_%d/name'.format(i, i, j)));
@@ -497,7 +494,7 @@ return L.view.extend({
hostname = rpc_replies[1],
procmtd = rpc_replies[2],
procpart = rpc_replies[3],
- has_rootfs_data = rpc_replies.slice(4).filter(function(n) { return n == 'rootfs_data' })[0],
+ has_rootfs_data = (procmtd.match(/"rootfs_data"/) != null) || rpc_replies.slice(4).filter(function(n) { return n == 'rootfs_data' })[0],
storage_size = findStorageSize(procmtd, procpart),
m, s, o, ss;