From cf6b28574d61566140dcb30d97ef721c88765bb0 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 26 Apr 2018 06:15:10 +0000 Subject: [PATCH] firmware: configdpRun, not configdRun #2066 --- .../OPNsense/Core/Api/FirmwareController.php | 10 +++++----- 1 file changed, 5 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 db44517d9..c7e04fdfa 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php @@ -74,14 +74,14 @@ class FirmwareController extends ApiControllerBase $backend = new Backend(); $type_have = trim($backend->configdRun('firmware type name')); $backend->configdRun('firmware changelog fetch'); + $args = array(); if (!empty($type_have) && $type_have !== $type_want) { - /* XXX $args does not work? */ - $response = json_decode(trim($backend->configdRun("firmware check $type_want")), true); - } else { - $response = json_decode(trim($backend->configdRun('firmware check')), true); + $args[] = $type_want; } + $response = json_decode(trim($backend->configdpRun('firmware check', $args)), true); + if ($response != null) { $packages_size = !empty($response['download_size']) ? $response['download_size'] : 0; $sets_size = 0; @@ -178,7 +178,7 @@ class FirmwareController extends ApiControllerBase $response['all_packages'] = $sorted; - if (!empty($type_have) && $type_have !== $type_want) { + if (count($args)) { $response['status_msg'] = gettext('The release type requires an update.'); $response['status_upgrade_action'] = 'rel'; $response['status'] = 'ok';