Skip to content

Commit 36aff9f

Browse files
committed
fix syntax error
move bank info to modgui modal
1 parent d0fe8fa commit 36aff9f

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

decompressed/base/etc/init.d/rootdevice

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ logecho() {
7575

7676
logecho_always() {
7777
logger -t "Root Script" "$@"
78-
echo "Root Script" "$@" >>rootdevice_log_file
78+
echo "Root Script" "$@" >>$rootdevice_log_file
7979
}
8080

8181
create_modgui_log() {

decompressed/gui_file/www/docroot/modals/gateway-modal.lp

-23
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,6 @@ local content = {
357357
fwversion_prefix = "uci.versioncusto.override.fwversion_prefix",
358358
fwversion_suffix = "uci.versioncusto.override.fwversion_suffix",
359359
fwversion_override = "uci.versioncusto.override.fwversion_override_real",
360-
activebank = "sys.banktable.activebank",
361-
passivebank = "sys.banktable.passivebank",
362-
activeversion = "sys.banktable.activeversion",
363-
passiveversion = "sys.banktable.passiveversion",
364-
rip_key_B = "rpc.system.modgui.utility.rip_key_B",
365360
schedule_reboot_get = "uci.system.scheduledreboot.enabled"
366361
}
367362

@@ -854,24 +849,6 @@ ngx.print(ui_helper.createMessages(message_helper.popMessages()))
854849
end
855850

856851
ngx.print(html)
857-
858-
local html = {}
859-
html[#html + 1] = '<legend>'.. T"Bank Info" ..'</legend>'
860-
html[#html + 1] = ui_helper.createLabel(T"Active Bank", content["activebank"] , basic)
861-
html[#html + 1] = ui_helper.createLabel(T"Active Version", content["activeversion"] , long_basic)
862-
html[#html + 1] = ui_helper.createLabel(T"Passive Bank", content["passivebank"] , basic)
863-
if content["passiveversion"] == "Unknown" then
864-
html[#html + 1] = ui_helper.createLabel(T"Passive Version", T"Firmware not present in this bank" , long_basic)
865-
else
866-
html[#html + 1] = ui_helper.createLabel(T"Passive Version", content["passiveversion"] , long_basic)
867-
end
868-
ngx.print(html)
869-
870-
local html = {}
871-
html[#html + 1] = '<legend>'.. T"Key Info" ..'</legend>'
872-
html[#html + 1] = ui_helper.createLabel(T"Config decrypt key", content["rip_key_B"] , basic)
873-
874-
ngx.print(html)
875852
ngx.print('\
876853
</form>\
877854
</fieldset>\

decompressed/gui_file/www/docroot/modals/modgui-modal.lp

+23
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,11 @@ local content = {
333333
specific_app = "uci.modgui.app.specific_app",
334334
telstra_gui = "uci.modgui.app.telstra_webui",
335335
fwversion_real = "uci.versioncusto.override.fwversion_override_real",
336+
activebank = "sys.banktable.activebank",
337+
passivebank = "sys.banktable.passivebank",
338+
activeversion = "sys.banktable.activeversion",
339+
passiveversion = "sys.banktable.passiveversion",
340+
rip_key_B = "rpc.system.modgui.utility.rip_key_B",
336341
}
337342
content_helper.getExactContent(content)
338343

@@ -765,6 +770,24 @@ ngx.print('\
765770
html[#html + 1] = ui_helper.createAlertBlock(T"Force the device to always use bank_2 partition as booted partition and bank_1 as active but corrupted<br/>This will also ensure that overlay (configs/mods partition) of bank_1 is empty or just have the rooting script preloaded.<br/>This bank plan allow to use TFTP flashing, as a reliable recovery procedure in case we mess-up with the bank_2 overlay", info_box)
766771
html[#html + 1] = ui_helper.createSwitch(T"OBP Check", "check_obp", modgui_settings["check_obp"])
767772
ngx.print(html)
773+
774+
local html = {}
775+
html[#html + 1] = '<legend>'.. T"Bank Info" ..'</legend>'
776+
html[#html + 1] = ui_helper.createLabel(T"Active Bank", content["activebank"] , basic)
777+
html[#html + 1] = ui_helper.createLabel(T"Active Version", content["activeversion"] , long_basic)
778+
html[#html + 1] = ui_helper.createLabel(T"Passive Bank", content["passivebank"] , basic)
779+
if content["passiveversion"] == "Unknown" then
780+
html[#html + 1] = ui_helper.createLabel(T"Passive Version", T"Firmware not present in this bank" , long_basic)
781+
else
782+
html[#html + 1] = ui_helper.createLabel(T"Passive Version", content["passiveversion"] , long_basic)
783+
end
784+
ngx.print(html)
785+
786+
local html = {}
787+
html[#html + 1] = '<legend>'.. T"Key Info" ..'</legend>'
788+
html[#html + 1] = ui_helper.createLabel(T"Config decrypt key", content["rip_key_B"] , basic)
789+
790+
ngx.print(html)
768791
ngx.print('\
769792
</form>\
770793
</fieldset>\

0 commit comments

Comments
 (0)