From 84b086ec96fcbf17ea1e030bb801e6065aa668b3 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 11 Feb 2021 16:29:28 +0100 Subject: [PATCH] firmware: provide check data to caller for upcoming refactor #4500 --- src/opnsense/scripts/firmware/check.sh | 6 +++++- src/opnsense/scripts/firmware/product.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/opnsense/scripts/firmware/check.sh b/src/opnsense/scripts/firmware/check.sh index 6f8ab2b0f..5137f33bf 100755 --- a/src/opnsense/scripts/firmware/check.sh +++ b/src/opnsense/scripts/firmware/check.sh @@ -37,6 +37,8 @@ # downgrade_packages: array with { name: , current_version: , new_version: } # upgrade_packages: array with { name: , current_version: , new_version: } +JSONFILE="/tmp/pkg_upgrade.json" + base_to_reboot="" connection="error" download_size="" @@ -367,7 +369,7 @@ else fi # write our json structure -cat << EOF +cat > ${JSONFILE} << EOF { "connection":"$connection", "downgrade_packages":[$packages_downgraded], @@ -387,3 +389,5 @@ cat << EOF "upgrade_packages":[$packages_upgraded] } EOF + +cat ${JSONFILE} diff --git a/src/opnsense/scripts/firmware/product.php b/src/opnsense/scripts/firmware/product.php index 32fdbb3bf..b8a64d960 100755 --- a/src/opnsense/scripts/firmware/product.php +++ b/src/opnsense/scripts/firmware/product.php @@ -37,6 +37,7 @@ if ($ret != null) { $repos = explode("\n", trim(shell_exec('opnsense-verify -l'))); sort($repos); $ret['product_repos'] = implode(', ', $repos); + $ret['product_check'] = json_decode(@file_get_contents('/tmp/pkg_upgrade.json'), true); ksort($ret); } else { $ret = [];