diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-10-02 12:59:23 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-10-02 13:02:04 +0200 |
| commit | 020ac1e08d02e37e49a3b96ab2db246dd7051dd2 (patch) | |
| tree | b6bd5b45b1ac42559019c5ba928782c79321af3a /modules | |
| parent | fb740f2c792696c64b3bd7115b25cdba32687003 (diff) | |
luci-mod-system: flash.js: fix "rootfs_data" partition detection
The `/sys/devices/virtual/mtd/` information is not available on all
devices so rely on the contents of `/proc/mtd` instead to check for
the existence of the `rootfs_data` partition.
Fixes: #3136
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json | 1 | ||||
| -rw-r--r-- | modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js | 7 |
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 182f24988..54caa7436 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 6f245533d..2309c8268 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; |