Commit 6e08824c authored by Franco Fichtner's avatar Franco Fichtner

firmware: repair the damage done

Base/kernel upgrade basically works.  I am not sure if we should
immediately trigger the reboot in this case.  OTOH, some might
ignore the obvious reason to boot the new kernel that had just
been aqcuired.  At least it's stable now and not easily killable
through the GUI reload anymore.  :)
parent a5460bb1
...@@ -46,7 +46,7 @@ if [ -z "$pkg_running" ]; then ...@@ -46,7 +46,7 @@ if [ -z "$pkg_running" ]; then
/usr/local/etc/rc.restart_webgui >> ${PKG_PROGRESS_FILE} /usr/local/etc/rc.restart_webgui >> ${PKG_PROGRESS_FILE}
# if we can update base, we'll do that as well # if we can update base, we'll do that as well
if opnsense-update -c; then if opnsense-update -c; then
if opnsense-update >> ${PROGRESS_FILE}; then if opnsense-update >> ${PKG_PROGRESS_FILE}; then
REBOOT=1 REBOOT=1
fi fi
fi fi
......
...@@ -255,8 +255,8 @@ include("head.inc"); ...@@ -255,8 +255,8 @@ include("head.inc");
jQuery('#output').prop('innerHTML',data); jQuery('#output').prop('innerHTML',data);
document.getElementById("output").scrollTop = document.getElementById("output").scrollHeight ; document.getElementById("output").scrollTop = document.getElementById("output").scrollHeight ;
if (data.indexOf('***REBOOT***') >= 0) { if (data.indexOf('***REBOOT***') >= 0) {
jQuery('#updatestatus').html('<span class="text-info">Upgrade done! A reboot is erquired.</span><br/>'); jQuery('#updatestatus').html('<span class="text-info">Upgrade done! A reboot is required.</span><br/>');
if (data.indexOf('***DONE***') >= 0) { } else if (data.indexOf('***DONE***') >= 0) {
jQuery('#updatestatus').html('<a href="/system_firmware_check.php"><span class="btn btn-primary btn-xs">Check to refresh</span></a>&nbsp;<span class="text-info">Upgrade done!</span><br/>'); jQuery('#updatestatus').html('<a href="/system_firmware_check.php"><span class="btn btn-primary btn-xs">Check to refresh</span></a>&nbsp;<span class="text-info">Upgrade done!</span><br/>');
} else { } else {
setTimeout(function() { updatestatus(); }, 500); setTimeout(function() { updatestatus(); }, 500);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment