firmware: keep polling as files may be unavailable during upgrade; cl…

…oses #927
opnsense · May 9, 2016 · 9526856 · 9526856
1 parent 0c35dbe
commit 9526856
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
@@ -91,6 +91,8 @@ POSSIBILITY OF SUCH DAMAGE.
         ajaxCall('/api/core/firmware/upgrade',{upgrade:$.upgrade_action},function() {
             $('#updatelist').empty();
             setTimeout(trackStatus, 500);
+        }).fail(function () {
+            setTimeout(trackStatus, 500);
         });
     }
 
@@ -105,6 +107,8 @@ POSSIBILITY OF SUCH DAMAGE.
         ajaxCall('/api/core/firmware/'+pkg_act+'/'+pkg_name,{},function() {
             $('#updatelist').empty();
             setTimeout(trackStatus, 500);
+        }).fail(function () {
+            setTimeout(trackStatus, 500);
         });
     }
 

diff --git a/src/opnsense/service/conf/actions.d/actions_firmware.conf b/src/opnsense/service/conf/actions.d/actions_firmware.conf
@@ -41,7 +41,7 @@ type:script
 message: remove firmware package %s
 
 [status]
-command:cat /tmp/pkg_upgrade.progress 2>&1 || exit 0
+command: /usr/bin/touch /tmp/pkg_upgrade.progress 2>&1; /bin/cat /tmp/pkg_upgrade.progress 2>&1
 parameters:
 type:script_output
 message:retrieve upgrade progress status