projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9befed1
)
Made flashing more responsive as well
author
Steven Barth
<steven@midlink.org>
Sat, 6 Sep 2008 15:15:38 +0000
(15:15 +0000)
committer
Steven Barth
<steven@midlink.org>
Sat, 6 Sep 2008 15:15:38 +0000
(15:15 +0000)
i18n/english/luasrc/i18n/admin-core.en.lua
patch
|
blob
|
history
i18n/english/luasrc/i18n/admin-core.en.xml
patch
|
blob
|
history
i18n/german/luasrc/i18n/admin-core.de.lua
patch
|
blob
|
history
i18n/german/luasrc/i18n/admin-core.de.xml
patch
|
blob
|
history
modules/admin-full/luasrc/controller/admin/system.lua
patch
|
blob
|
history
modules/admin-full/luasrc/view/admin_system/upgrade.htm
patch
|
blob
|
history
diff --git
a/i18n/english/luasrc/i18n/admin-core.en.lua
b/i18n/english/luasrc/i18n/admin-core.en.lua
index
44613f2
..
1279049
100644
(file)
--- a/
i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/
i18n/english/luasrc/i18n/admin-core.en.lua
@@
-69,6
+69,8
@@
a_s_fstab_swap1 = 'If your physical memory is insufficient unused data can be te
a_s_flash_flashed = 'Firmware successfully flashed. Rebooting device...'
a_s_flash_flasherr = 'Failed to flash'
a_s_flash_fwimage = 'Firmwareimage'
a_s_flash_flashed = 'Firmware successfully flashed. Rebooting device...'
a_s_flash_flasherr = 'Failed to flash'
a_s_flash_fwimage = 'Firmwareimage'
+a_s_flash_received = 'Image received. About to start flashing process. DO NOT POWER OFF THE DEVICE!'
+a_s_flash_inprogress = 'Writing firmware...'
a_s_flash_fwupgrade = 'Flash Firmware'
a_s_flash_keepcfg = 'Keep configuration files'
a_s_flash_notimplemented = 'Sorry, this function is not (yet) available for your platform.'
a_s_flash_fwupgrade = 'Flash Firmware'
a_s_flash_keepcfg = 'Keep configuration files'
a_s_flash_notimplemented = 'Sorry, this function is not (yet) available for your platform.'
diff --git
a/i18n/english/luasrc/i18n/admin-core.en.xml
b/i18n/english/luasrc/i18n/admin-core.en.xml
index
ec78c77
..
8a8d21f
100644
(file)
--- a/
i18n/english/luasrc/i18n/admin-core.en.xml
+++ b/
i18n/english/luasrc/i18n/admin-core.en.xml
@@
-73,6
+73,8
@@
<i18n:msg xml:id="a_s_flash_flashed">Firmware successfully flashed. Rebooting device...</i18n:msg>
<i18n:msg xml:id="a_s_flash_flasherr">Failed to flash</i18n:msg>
<i18n:msg xml:id="a_s_flash_fwimage">Firmwareimage</i18n:msg>
<i18n:msg xml:id="a_s_flash_flashed">Firmware successfully flashed. Rebooting device...</i18n:msg>
<i18n:msg xml:id="a_s_flash_flasherr">Failed to flash</i18n:msg>
<i18n:msg xml:id="a_s_flash_fwimage">Firmwareimage</i18n:msg>
+<i18n:msg xml:id="a_s_flash_received">Image received. About to start flashing process. DO NOT POWER OFF THE DEVICE!</i18n:msg>
+<i18n:msg xml:id="a_s_flash_inprogress">Writing firmware...</i18n:msg>
<i18n:msg xml:id="a_s_flash_fwupgrade">Flash Firmware</i18n:msg>
<i18n:msg xml:id="a_s_flash_keepcfg">Keep configuration files</i18n:msg>
<i18n:msg xml:id="a_s_flash_notimplemented">Sorry, this function is not (yet) available for your platform.</i18n:msg>
<i18n:msg xml:id="a_s_flash_fwupgrade">Flash Firmware</i18n:msg>
<i18n:msg xml:id="a_s_flash_keepcfg">Keep configuration files</i18n:msg>
<i18n:msg xml:id="a_s_flash_notimplemented">Sorry, this function is not (yet) available for your platform.</i18n:msg>
diff --git
a/i18n/german/luasrc/i18n/admin-core.de.lua
b/i18n/german/luasrc/i18n/admin-core.de.lua
index
224d742
..
509c496
100644
(file)
--- a/
i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/
i18n/german/luasrc/i18n/admin-core.de.lua
@@
-39,6
+39,8
@@
a_s_flash = 'Upgrade'
a_s_flash_flashed = 'Flashvorgang erfolgreich. Router startet neu...'
a_s_flash_flasherr = 'Flashvorgang fehlgeschlagen'
a_s_flash_fwimage = 'Firmwareimage'
a_s_flash_flashed = 'Flashvorgang erfolgreich. Router startet neu...'
a_s_flash_flasherr = 'Flashvorgang fehlgeschlagen'
a_s_flash_fwimage = 'Firmwareimage'
+a_s_flash_received = 'Abbild empfangen. Starte Flashvorgang. SCHALTEN SIE DAS GERÄT NICHT AUS!'
+a_s_flash_inprogress = 'Schreibe Firmware...'
a_s_flash_fwupgrade = 'Firmware aktualisieren'
a_s_flash_keepcfg = 'Konfigurationsdateien übernehmen'
a_s_flash_notimplemented = 'Diese Funktion steht leider (noch) nicht zur Verfügung.'
a_s_flash_fwupgrade = 'Firmware aktualisieren'
a_s_flash_keepcfg = 'Konfigurationsdateien übernehmen'
a_s_flash_notimplemented = 'Diese Funktion steht leider (noch) nicht zur Verfügung.'
diff --git
a/i18n/german/luasrc/i18n/admin-core.de.xml
b/i18n/german/luasrc/i18n/admin-core.de.xml
index
7e12695
..
48f9493
100644
(file)
--- a/
i18n/german/luasrc/i18n/admin-core.de.xml
+++ b/
i18n/german/luasrc/i18n/admin-core.de.xml
@@
-43,6
+43,8
@@
<i18n:msg xml:id="a_s_flash_flashed">Flashvorgang erfolgreich. Router startet neu...</i18n:msg>
<i18n:msg xml:id="a_s_flash_flasherr">Flashvorgang fehlgeschlagen</i18n:msg>
<i18n:msg xml:id="a_s_flash_fwimage">Firmwareimage</i18n:msg>
<i18n:msg xml:id="a_s_flash_flashed">Flashvorgang erfolgreich. Router startet neu...</i18n:msg>
<i18n:msg xml:id="a_s_flash_flasherr">Flashvorgang fehlgeschlagen</i18n:msg>
<i18n:msg xml:id="a_s_flash_fwimage">Firmwareimage</i18n:msg>
+<i18n:msg xml:id="a_s_flash_received">Abbild empfangen. Starte Flashvorgang. SCHALTEN SIE DAS GERÄT NICHT AUS!</i18n:msg>
+<i18n:msg xml:id="a_s_flash_inprogress">Schreibe Firmware...</i18n:msg>
<i18n:msg xml:id="a_s_flash_fwupgrade">Firmware aktualisieren</i18n:msg>
<i18n:msg xml:id="a_s_flash_keepcfg">Konfigurationsdateien übernehmen</i18n:msg>
<i18n:msg xml:id="a_s_flash_notimplemented">Diese Funktion steht leider (noch) nicht zur Verfügung.</i18n:msg>
<i18n:msg xml:id="a_s_flash_fwupgrade">Firmware aktualisieren</i18n:msg>
<i18n:msg xml:id="a_s_flash_keepcfg">Konfigurationsdateien übernehmen</i18n:msg>
<i18n:msg xml:id="a_s_flash_notimplemented">Diese Funktion steht leider (noch) nicht zur Verfügung.</i18n:msg>
diff --git
a/modules/admin-full/luasrc/controller/admin/system.lua
b/modules/admin-full/luasrc/controller/admin/system.lua
index
6cf951a
..
bbe202d
100644
(file)
--- a/
modules/admin-full/luasrc/controller/admin/system.lua
+++ b/
modules/admin-full/luasrc/controller/admin/system.lua
@@
-182,7
+182,7
@@
end
function action_upgrade()
require("luci.model.uci")
function action_upgrade()
require("luci.model.uci")
- local ret
= nil
+ local ret
local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
local tmpfile = "/tmp/firmware.img"
local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
local tmpfile = "/tmp/firmware.img"
local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
@@
-208,7
+208,9
@@
function action_upgrade()
local keepcfg = keep_avail and luci.http.formvalue("keepcfg")
if plat and fname then
local keepcfg = keep_avail and luci.http.formvalue("keepcfg")
if plat and fname then
- ret = luci.sys.flash(tmpfile, keepcfg and _keep_pattern())
+ ret = function()
+ return luci.sys.flash(tmpfile, keepcfg and _keep_pattern())
+ end
end
luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
end
luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
diff --git
a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index
e0fbb93
..
03cd555
100644
(file)
--- a/
modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/
modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@
-34,7
+34,10
@@
$Id$
</div>
</form>
<% elseif ret then %>
</div>
</form>
<% elseif ret then %>
- <% if ret == 0 then %>
+ <p><%:a_s_flash_received%></p>
+ <p><%:a_s_flash_inprogress%></p>
+ <% local ret = ret()
+ if ret == 0 then %>
<div class="ok"><%:a_s_flash_flashed%></div>
<% else %>
<div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div>
<div class="ok"><%:a_s_flash_flashed%></div>
<% else %>
<div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div>