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

gluon-luci-admin: Fix uploaded image validation

Browse Source 
The image validation currently fails on some devices (tested OpenMesh)
because it isn't done via sysupgrade. But the checks depend partially on
the integration in sysupgrade (e.g. via loops that can be stopped via
"break statements").

Instead of hacking its own version check, it is easier and better tested to
just use 'sysupgrade -T' like it is already done by LuCI.

Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
This commit is contained in:
Sven Eckelmann 2016-05-16 13:17:29 +02:00 committed by Sven Eckelmann
parent 54bc175cc1
commit d30a6ff1db
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/upgrade.lua
View File

@ -101,9 +101,7 @@ end
function image_supported(tmpfile) function image_supported(tmpfile)
-- XXX: yay... -- XXX: yay...
return ( 0 == os.execute( return ( 0 == os.execute(
". /lib/functions.sh; " .. "/sbin/sysupgrade -T %q >/dev/null"
"include /lib/upgrade; " ..
"platform_check_image %q >/dev/null"
% tmpfile % tmpfile
) ) ) )
end end