From a32e0f443c78847cfadf4f80561187c8f6614e2f Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 27 May 2020 13:14:50 -1000 Subject: [PATCH] luci-app-attendedsysupgrade: Send target to server Currently the running devices `board_name` is mapped to it's building `profile` name. In case of inconsistent `board_names` like the x86/64 target, it is hard to create a mapping that translates `lenovo-20q1s02m00` to x86/64 and the generic profile. To handle such cases, send the `target` per default. Also `model` is no longer needed as no heuristics are applied anymore to find the relation between model and profile. Signed-off-by: Paul Spooren --- .../root/www/luci-static/resources/attendedsysupgrade.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js index 9cfd1bc7a6..b75e90d9a7 100644 --- a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js +++ b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js @@ -63,7 +63,6 @@ function setup() { ubus_call("rpc-sys", "packagelist", {}, "packages"); ubus_call("system", "board", {}, "release"); ubus_call("system", "board", {}, "board_name"); - ubus_call("system", "board", {}, "model"); ubus_call("system", "info", {}, "memory"); uci_get({ "config": "attendedsysupgrade", @@ -220,13 +219,14 @@ function upgrade_check() { function upgrade_request() { // Request firmware using the following parameters - // distro, version, target, board_name/model, packages + // distro, version, target, board_name, packages $("#upgrade_button").disabled = true; hide("#edit_packages"); hide("#edit_button"); hide("#keep_container"); // add board info to let server determine profile + request_dict.target = data.release.target request_dict.profile = data.board_name if (data.edit_packages == true) { -- 2.30.2