diff options
| author | Paul Spooren <mail@aparcar.org> | 2022-06-07 14:23:59 +0200 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2022-07-29 17:04:12 +0200 |
| commit | b356e9413791828cd40b626be0c9645c21c17c01 (patch) | |
| tree | da9e738efdc65d8e39a7915385e9cd6690186907 | |
| parent | c6d28851d75eeaa288db2a20c11f4c15f45d235e (diff) | |
luci-app-attendedsysugprade: allow to reinstall image
Now it's possible to re-install the currently running version in
advanced mode. This can be useful when installing packages via `opkg`
and then requesting the firmware with the packages stored in squashfs.
FIXES: https://github.com/openwrt/luci/issues/5809
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit fd72e1c23ef1569fd8f8ab71bdcb4a94f802435a)
| -rw-r--r-- | applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js | 12 |
1 files changed, 11 insertions, 1 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 1b794545e2..cac75d7f1d 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 @@ -341,6 +341,11 @@ return view.extend({ } } + // allow to re-install running firmware in advanced mode + if (this.data.advanced_mode == 1) { + candidates.unshift([version, revision]) + } + if (candidates.length) { var m, s, o; @@ -357,7 +362,12 @@ return view.extend({ s = map.section(form.NamedSection, 'request', '', '', 'Use defaults for the safest update'); o = s.option(form.ListValue, 'version', 'Select firmware version'); for (let candidate of candidates) { - o.value(candidate[0], candidate[1] ? `${candidate[0]} - ${candidate[1]}` : candidate[0]); + if (candidate[0] == version && candidate[1] == revision) { + o.value(candidate[0], _('[installed] %s') + .format(candidate[1] ? `${candidate[0]} - ${candidate[1]}` : candidate[0])); + } else { + o.value(candidate[0], candidate[1] ? `${candidate[0]} - ${candidate[1]}` : candidate[0]); + } } if (this.data.advanced_mode == 1) { |