Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-attendedsysupgrade: add target in reuqest

Browse source 
The updated ASU api requires `target` within reuqests since the
`profile` or `board_name` is never truely unique. This is especially a
problem for x86 devices which mostly use `generic` as profile name.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2021-04-24 03:45:36 -10:00
parent dd5d96afdb
commit c6b4d4ab5a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
View file

@ -77,6 +77,7 @@ function request_sysupgrade(server_url, data) {
} else { } else {
req = request.post(server_url + "/api/build", { req = request.post(server_url + "/api/build", {
profile: data.board_name, profile: data.board_name,
target: data.target,
version: data.version, version: data.version,
packages: data.packages, packages: data.packages,
diff_packages: true, diff_packages: true,
@ -213,7 +214,7 @@ function request_sysupgrade(server_url, data) {
}); });
} }
function check_sysupgrade(server_url, current_version, board_name, packages) { function check_sysupgrade(server_url, current_version, target, board_name, packages) {
displayStatus("notice spinning", E('p', _('Searching for an available sysupgrade'))); displayStatus("notice spinning", E('p', _('Searching for an available sysupgrade')));
var current_branch = current_version.split(".").slice(0, 2).join("."); var current_branch = current_version.split(".").slice(0, 2).join(".");
var candidates = []; var candidates = [];
@ -253,6 +254,7 @@ function check_sysupgrade(server_url, current_version, board_name, packages) {
var mapdata = { var mapdata = {
request: { request: {
board_name: board_name, board_name: board_name,
target: target,
version: candidates[0], version: candidates[0],
packages: Object.keys(packages).sort(), packages: Object.keys(packages).sort(),
} }
@ -339,6 +341,7 @@ return view.extend({
render: function(res) { render: function(res) {
var packages = res[0].packages; var packages = res[0].packages;
var current_version = res[1].release.version; var current_version = res[1].release.version;
var target = res[1].release.target;
var board_name = res[1].board_name; var board_name = res[1].board_name;
var auto_search = uci.get_first('attendedsysupgrade', 'client', 'auto_search') || 1; var auto_search = uci.get_first('attendedsysupgrade', 'client', 'auto_search') || 1;
var server_url = uci.get_first('attendedsysupgrade', 'server', 'url'); var server_url = uci.get_first('attendedsysupgrade', 'server', 'url');
@ -350,13 +353,13 @@ return view.extend({
]; ];
if (auto_search == 1) { if (auto_search == 1) {
check_sysupgrade(server_url, current_version, board_name, packages) check_sysupgrade(server_url, current_version, target, board_name, packages)
} }
view.push(E('p', { view.push(E('p', {
'class': 'btn cbi-button-positive', 'class': 'btn cbi-button-positive',
'click': function() { 'click': function() {
check_sysupgrade(server_url, current_version, board_name, packages) check_sysupgrade(server_url, current_version, target, board_name, packages)
} }
}, _('Search for sysupgrade'))); }, _('Search for sysupgrade')));