Commit graph

25 commits

Author SHA1 Message Date
Dirk Brenken
8c6a29a45c
luci-mod-system: remove bogus btn class in flash.js
* fixes #4970
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-04-15 19:52:52 +02:00
Hannu Nyman
e2ac2e92b0 luci-base: correct button name on flash page help text
Correct the help text in the flash page to match the current
buttons. 'Continue' instead of "Proceed".

Adjust translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-01-12 19:13:52 +02:00
Jo-Philipp Wich
d2d3738d90 luci-mod-system: ignore empty /proc/mtd on flash page
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>
2020-07-22 10:29:11 +02:00
Huangbin Zhan
6e9b996c63 luci-mod-system: fix button disabled status
Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
2020-05-13 04:26:59 +08:00
Jo-Philipp Wich
684f7dd7dc luci-mod-system: flash.js: make readonly on insufficient ACLs
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-16 15:35:13 +02:00
Jo-Philipp Wich
3c4bc228a1 treewide: import utility classes explicitly
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-03 10:00:06 +02:00
Ansuel Smith
5e6ec8562f
luci-base: remove hardcoded cgi-bin path
Currently LuCI can be loaded only when placed in the root of the server as the cgi-bin path are hardcoded. Change the index.html to load the cgi-bin path from the current level.
Also add a new entry in the env Object to make the cgi_base path easily accessible.
This variable will be based on the position of /cgi-bin/luci.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
2020-01-16 15:02:14 +01:00
Jo-Philipp Wich
86f492173d treewide: require ui.js explicitly
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-03 21:55:50 +01:00
Jo-Philipp Wich
af5dc2652e luci-mod-system: flash.js: upon sysupgrade, select reconnect ip by keep state
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:45:00 +01:00
Jo-Philipp Wich
7d84396471 luci-mod-system: flash.js: fix flash erase modal
The firstboot rpc call might not return, therefor do not wait on promise
fullfillment but display modal dialog right away.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:42:48 +01:00
Jo-Philipp Wich
33346dadf4 luci-base, luci-mod-system: move file upload handling to ui.js
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:03:33 +01:00
Jo-Philipp Wich
36b052f8cc luci-mod-system: flash.sh: gracefully handle missing sysupgrade.conf
Fixes: #3228
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-21 15:30:22 +02:00
Jo-Philipp Wich
3d11af11a7
Merge pull request #3145 from ptpt52/refine-flash-reset
luci-mod-system: refine flash reset
2019-10-16 21:31:26 +02:00
Jo-Philipp Wich
5ccbda54e8 luci-mod-system: flash.js: fix passing sysupgrade opts
Instead of binding the checked state to the button handler function,
bind the underlying checkboxes instead to observe the actual user
choice instead of the initial value.

This fixes forcing sysupgrade or deselecting keep settings.

Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 19:55:31 +02:00
Chen Minqiang
29aad47121 luci-mod-system: refine flash reset
We determine flash reset capability by checking overlayfs in /proc/mounts

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
2019-10-07 23:37:35 +08:00
Jo-Philipp Wich
29ccea14f1 luci-mod-system: use awaitReconnect() from ui.js
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 11:53:39 +02:00
Jo-Philipp Wich
807dd50640 luci-mod-system: flash.js: use common fs.js class
Also move the keep settings checkbox above the error messages in the
sysupgrade confirmation dialog.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 11:53:39 +02:00
Jo-Philipp Wich
020ac1e08d 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>
2019-10-02 13:02:04 +02:00
Rafał Miłecki
fb740f2c79 luci-mod-system: check for sysupgrade with backup possibility
Some firmware images may not support preserving backup. In such cases
display a warning and disable relevant checkbox.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2019-10-02 11:13:19 +02:00
Rafał Miłecki
5f2a17938f luci-mod-system: check if it's possible to force sysupgrade
Some validation errors may be critical enough to prevent sysupgrade.
Check the "forceable" property and disallow forcing sysupgrade if
applicable. It would fail anyway at the "sysupgrade" call.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2019-10-02 09:47:20 +02:00
Rafał Miłecki
7c108683c6 luci-mod-system: use "system" new "validate_firmware_image" ubus method
This new ubus method provides more properly-formatted details about
firmware file. Use it to check if uploaded image is valid.

The old "sysupgrade --test" method is left for now to provide stderr
output.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
[Added missing ACL, add default value for the ubus failure case]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-02 09:46:18 +02:00
Jo-Philipp Wich
855208c59d luci-mod-system: flash.js: disable mtdblock downloads on mtd-less systems
Ref: 3c40a7450a (commitcomment-35233073)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-25 19:42:06 +02:00
Jo-Philipp Wich
e17cd94be7 luci-mod-system: flash.js: rename handleReset to handleFirstboot
Rename the procedure to prevent a name clash with the standard view action
which we intentionally disable.

Ref: 3c40a7450a (commitcomment-35233207)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-25 19:37:27 +02:00
Jo-Philipp Wich
3c40a7450a luci-mod-system: flash.js: improve storage size detection heuristics
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-25 16:23:02 +02:00
Jo-Philipp Wich
2a5c5f47f9 luci-mod-system: reimplement flashops as client side view
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-24 14:21:08 +02:00