From f74c1f583df3c12c07626ed4603bcce000b3976d Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 27 Jun 2018 16:08:50 +0000
Subject: [PATCH] firmware: "The package manager is not responding."

---
 .../OPNsense/Core/Api/FirmwareController.php          |  3 +++
 src/opnsense/scripts/firmware/check.sh                | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
index 3f785f377..988a306ac 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
@@ -182,6 +182,9 @@ class FirmwareController extends ApiControllerBase
                 $response['status_msg'] = gettext('The release type requires an update.');
                 $response['status_upgrade_action'] = 'rel';
                 $response['status'] = 'ok';
+            } elseif (array_key_exists('connection', $response) && $response['connection'] == 'busy') {
+                $response['status_msg'] = gettext('The package manager is not responding.');
+                $response['status'] = 'error';
             } elseif (array_key_exists('connection', $response) && $response['connection'] == 'unresolved') {
                 $response['status_msg'] = gettext('No address record found for the selected mirror.');
                 $response['status'] = 'error';
diff --git a/src/opnsense/scripts/firmware/check.sh b/src/opnsense/scripts/firmware/check.sh
index a58fc15e5..bcbcc2ba2 100755
--- a/src/opnsense/scripts/firmware/check.sh
+++ b/src/opnsense/scripts/firmware/check.sh
@@ -26,7 +26,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # This script generates a json structured file with the following content:
-# connection: error|timeout|unauthenticated|misconfigured|unresolved|ok
+# connection: error|timeout|unauthenticated|misconfigured|unresolved|busy|ok
 # repository: error|ok
 # last_ckeck: <date_time_stamp>
 # updates: <num_of_updates>
@@ -338,9 +338,12 @@ if [ "$pkg_running" == "" ]; then
       product_name=$(cat /usr/local/opnsense/version/opnsense.name)
       os_version=$(uname -sr)
       last_check=$(date)
+else
+  connection=busy
+fi
 
-      # write our json structure
-      cat << EOF
+# write our json structure
+cat << EOF
 {
 	"connection":"$connection",
 	"downgrade_packages":[$packages_downgraded],
@@ -360,5 +363,3 @@ if [ "$pkg_running" == "" ]; then
 	"upgrade_packages":[$packages_upgraded]
 }
 EOF
-
-fi