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

gluon-web-admin: show sha256sum to verify upgrade (#1441)

Browse Source
This commit is contained in:
J0WI 2018-06-19 19:24:27 +02:00 committed by Matthias Schiffer
parent 4919f5443d
commit ee97fe8b9e
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/upgrade_confirm.html
View File

@ -12,7 +12,7 @@ You may obtain a copy of the License at
<h2><%:Upgrade firmware%></h2> <h2><%:Upgrade firmware%></h2>
<p> <p>
<%:The firmware image has been transmitted. Please ensure the MD5 checksum and image size are correct and click "continue".%> <%:The firmware image has been transmitted. Please ensure the SHA-256 checksum and image size are correct and click "continue".%>
</p> </p>
<% if flashsize > 0 and filesize > flashsize then %> <% if flashsize > 0 and filesize > flashsize then %>
@ -21,7 +21,7 @@ You may obtain a copy of the License at
<p> <p>
<ul> <ul>
<li>md5sum: <code><%=checksum%></code></li> <li>sha256sum: <code><%=checksum%></code></li>
<li><%:Size%>: <% <li><%:Size%>: <%
function byte_format(byte) function byte_format(byte)
local suff = {"B", "KB", "MB", "GB", "TB"} local suff = {"B", "KB", "MB", "GB", "TB"}

4
package/gluon-web-admin/i18n/de.po
View File

@ -90,10 +90,10 @@ msgid "Size"
msgstr "Größe" msgstr "Größe"
msgid "" msgid ""
"The firmware image has been transmitted. Please ensure the MD5 checksum and " "The firmware image has been transmitted. Please ensure the SHA-256 checksum and "
"image size are correct and click \"continue\"." "image size are correct and click \"continue\"."
msgstr "" msgstr ""
"Die Firmwaredatei wurde übermittelt. Bitte vergleiche MD5-Checksumme und " "Die Firmwaredatei wurde übermittelt. Bitte vergleiche SHA-256-Checksumme und "
"Dateigröße und klicke anschließend auf \"fortfahren\"." "Dateigröße und klicke anschließend auf \"fortfahren\"."
msgid "The firmware is currently being upgraded." msgid "The firmware is currently being upgraded."

4
package/gluon-web-admin/i18n/fr.po
View File

@ -91,10 +91,10 @@ msgid "Size"
msgstr "Taille" msgstr "Taille"
msgid "" msgid ""
"The firmware image has been transmitted. Please ensure the MD5 checksum and " "The firmware image has been transmitted. Please ensure the SHA-256 checksum and "
"image size are correct and click \"continue\"." "image size are correct and click \"continue\"."
msgstr "" msgstr ""
"L'image de firmware a été transmise. Vérifiez que la somme MD5 et la taille " "L'image de firmware a été transmise. Vérifiez que la somme SHA-256 et la taille "
"de l'image correspondent, et appuiez ensuite sur \"continuer\"." "de l'image correspondent, et appuiez ensuite sur \"continuer\"."
msgid "The firmware is currently being upgraded." msgid "The firmware is currently being upgraded."

2
package/gluon-web-admin/i18n/gluon-web-admin.pot
View File

@ -77,7 +77,7 @@ msgid "Size"
msgstr "" msgstr ""
msgid "" msgid ""
"The firmware image has been transmitted. Please ensure the MD5 checksum and " "The firmware image has been transmitted. Please ensure the SHA-256 checksum and "
"image size are correct and click \"continue\"." "image size are correct and click \"continue\"."
msgstr "" msgstr ""

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

@ -88,7 +88,7 @@ local function action_upgrade(http, renderer)
end end
local function image_checksum(tmpfile) local function image_checksum(tmpfile)
return (util.exec(string.format("exec md5sum %q", tmpfile)):match("^([^%s]+)")) return (util.exec(string.format("exec sha256sum %q", tmpfile)):match("^([^%s]+)"))
end end