nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web-admin: ignore minor compat-version on upgrade (#2590)

Browse Source 
This implements the same behavior as it is used in the autoupdater [1].

This is for example required to allow the manual installation of
firmware upgrades via the config mode on devices which where migrated
from swconfig to DSA. Otherwise the image will always be invalid.

[1] b804281664
This commit is contained in:
Tom Herbers 2022-08-09 20:16:33 +02:00 committed by GitHub
parent 20eea9b9ca
commit 75ceb0d963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/gluon-web-admin/luasrc/lib/gluon/config-mode/controller/admin/upgrade.lua
View File

@ -17,6 +17,7 @@ local unistd = require 'posix.unistd'
local file local file
local tmpfile = "/tmp/firmware.img" local tmpfile = "/tmp/firmware.img"
local compat_option = "--ignore-minor-compat-version"
local function filehandler(_, chunk, eof) local function filehandler(_, chunk, eof)
@ -64,7 +65,7 @@ local function action_upgrade(http, renderer)
end end
local function image_supported(supported_tmpfile) local function image_supported(supported_tmpfile)
return (os.execute(string.format("exec /sbin/sysupgrade -T %q >/dev/null", supported_tmpfile)) == 0) return (os.execute(string.format("exec /sbin/sysupgrade -T %s %q >/dev/null", compat_option, supported_tmpfile)) == 0)
end end
local function storage_size() local function storage_size()
@ -122,7 +123,7 @@ local function action_upgrade(http, renderer)
}, 'gluon-web-admin') }, 'gluon-web-admin')
elseif step == 3 then elseif step == 3 then
local cmd = {[0] = '/sbin/sysupgrade', tmpfile} local cmd = {[0] = '/sbin/sysupgrade', compat_option, tmpfile}
if http:formvalue('keepcfg') ~= '1' then if http:formvalue('keepcfg') ~= '1' then
table.insert(cmd, 1, '-n') table.insert(cmd, 1, '-n')
end end