diff options
| author | Paul Spooren <mail@aparcar.org> | 2022-03-21 11:44:11 +0000 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2022-03-22 22:33:33 +0000 |
| commit | 8936e3c386e77c2dc090dbbd5a87907196f9149b (patch) | |
| tree | 4280dd73c3a3c76a11dbea7ae3c4778dbeddade0 /applications/luci-app-attendedsysupgrade | |
| parent | fe9aa934bacb1128819d34feee41a1292c17e700 (diff) | |
luci-app-attendedsysupgrade: request filesystem
It is possible to request a specific filesystem so no other filesystems
are used. This speeds up the build process and may prevent failures in
edge cases.
A recent edge case is installing more packages than ext4 can handle
while squashfs works fine due to compression.
Since `rootfs_type` is now always available via `procd`, remove the
hack of reading `/proc/mounts`.
Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'applications/luci-app-attendedsysupgrade')
2 files changed, 5 insertions, 9 deletions
diff --git a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js index a82f7bdbed..e9e937c8d1 100644 --- a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js +++ b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js @@ -79,13 +79,14 @@ return view.extend({ version: '', packages: [], diff_packages: true, + filesystem: '', }, handle200: function (response) { res = response.json(); var image; for (image of res.images) { - if (this.data.rootfs_type == image.filesystem) { + if (this.firmware.filesystem == image.filesystem) { if (this.data.efi) { if (image.type == 'combined-efi') { break; @@ -402,7 +403,6 @@ return view.extend({ L.resolveDefault(callPackagelist(), {}), L.resolveDefault(callSystemBoard(), {}), L.resolveDefault(fs.stat("/sys/firmware/efi"), null), - fs.read("/proc/mounts"), uci.load('attendedsysupgrade'), ]); }, @@ -415,13 +415,10 @@ return view.extend({ this.firmware.target = res[1].release.target; this.firmware.version = res[1].release.version; this.data.branch = get_branch(res[1].release.version); + this.firmware.filesystem = res[1].rootfs_type; this.data.revision = res[1].release.revision; + this.data.efi = res[2]; - if (res[1].rootfs_type) { - this.data.rootfs_type = res[1].rootfs_type; - } else { - this.data.rootfs_type = res[3].split(/\r?\n/)[0].split(' ')[2] - } this.data.url = uci.get_first('attendedsysupgrade', 'server', 'url'); this.data.advanced_mode = uci.get_first('attendedsysupgrade', 'client', 'advanced_mode') || 0 diff --git a/applications/luci-app-attendedsysupgrade/root/usr/share/rpcd/acl.d/luci-app-attendedsysupgrade.json b/applications/luci-app-attendedsysupgrade/root/usr/share/rpcd/acl.d/luci-app-attendedsysupgrade.json index 378967da34..0faf96717e 100644 --- a/applications/luci-app-attendedsysupgrade/root/usr/share/rpcd/acl.d/luci-app-attendedsysupgrade.json +++ b/applications/luci-app-attendedsysupgrade/root/usr/share/rpcd/acl.d/luci-app-attendedsysupgrade.json @@ -16,8 +16,7 @@ ] }, "file": { - "/sys/firmware/efi": [ "list" ], - "/proc/mounts": [ "read" ] + "/sys/firmware/efi": [ "list" ] }, "uci": [ "attendedsysupgrade" |