From c5a586e06849f50a0cc87bca0d95bbf269557d5b Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 28 Nov 2018 14:25:39 +0000
Subject: [PATCH] firmware: size for kernel / base

---
 .../OPNsense/Core/Api/FirmwareController.php      |  2 ++
 src/opnsense/scripts/firmware/check.sh            |  8 ++++----
 src/opnsense/scripts/firmware/health.sh           |  9 ++++++---
 src/opnsense/scripts/firmware/sets.sh             | 15 +++++++++------
 4 files changed, 21 insertions(+), 13 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 4fb57ac4a..f8153ec3c 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
@@ -742,6 +742,8 @@ class FirmwareController extends ApiControllerBase
                     }
                 }
 
+                /* XXX fixup kernel/base set size */
+
                 /* mark remote packages as "provided", local as "installed" */
                 $translated['provided'] = $type == 'remote' ? "1" : "0";
                 $translated['installed'] = $type == 'local' ? "1" : "0";
diff --git a/src/opnsense/scripts/firmware/check.sh b/src/opnsense/scripts/firmware/check.sh
index 894ccc6d9..b4c10f304 100755
--- a/src/opnsense/scripts/firmware/check.sh
+++ b/src/opnsense/scripts/firmware/check.sh
@@ -273,13 +273,13 @@ if [ "$pkg_running" == "" ]; then
             elif [ -z "$base_to_reboot" ]; then
               if opnsense-update -cbf; then
                   base_to_reboot="$(opnsense-update -v)"
+                  # XXX arch return is obsolete
                   base_to_reboot="${base_to_reboot%-*}"
               fi
             fi
 
             if [ -n "$base_to_reboot" ]; then
-              base_to_delete="$(opnsense-update -bv)"
-              base_to_delete="${base_to_delete%-*}"
+              base_to_delete="$(opnsense-version -vp base)"
               base_is_size="$(opnsense-update -bfSr $base_to_reboot)"
               if [ "$base_to_reboot" != "$base_to_delete" -a -n "$base_is_size" ]; then
                 if [ "$packages_upgraded" == "" ]; then
@@ -301,13 +301,13 @@ if [ "$pkg_running" == "" ]; then
             elif [ -z "$kernel_to_reboot" ]; then
               if opnsense-update -cfk; then
                   kernel_to_reboot="$(opnsense-update -v)"
+                  # XXX arch return is obsolete
                   kernel_to_reboot="${kernel_to_reboot%-*}"
               fi
             fi
 
             if [ -n "$kernel_to_reboot" ]; then
-              kernel_to_delete="$(opnsense-update -kv)"
-              kernel_to_delete="${kernel_to_delete%-*}"
+              kernel_to_delete="$(opnsense-version -vp kernel)"
               kernel_is_size="$(opnsense-update -fkSr $kernel_to_reboot)"
               if [ "$kernel_to_reboot" != "$kernel_to_delete" -a -n "$kernel_is_size" ]; then
                 if [ "$packages_upgraded" == "" ]; then
diff --git a/src/opnsense/scripts/firmware/health.sh b/src/opnsense/scripts/firmware/health.sh
index ab3e4ab2b..d62be787b 100755
--- a/src/opnsense/scripts/firmware/health.sh
+++ b/src/opnsense/scripts/firmware/health.sh
@@ -58,18 +58,21 @@ for PATTERN in ${MTREE_PATTERNS}; do
 done
 
 VERSION=$(opnsense-update -v)
+# XXX only for migration
+VERSION=${VERSION%-*}
 
 set_check()
 {
 	SET=${1}
 	FILE=${2}
-	VER=${3}
 
 	if [ ! -f ${BASE_MTREE} ]; then
 		# XXX complain if file is missing post-18.7
 		return
 	fi
 
+	VER=$(opnsense-version -p ${SET})
+
 	echo ">>> Check installed ${SET} version" >> ${PKG_PROGRESS_FILE}
 	if [ -z "${VER}" -o -z "${VERSION}" ]; then
 		echo "Failed to determine version info."
@@ -105,8 +108,8 @@ set_check()
 }
 
 echo "***GOT REQUEST TO AUDIT HEALTH***" >> ${PKG_PROGRESS_FILE}
-set_check kernel ${KERNEL_MTREE} "$(opnsense-update -kv)"
-set_check base ${BASE_MTREE} "$(opnsense-update -bv)"
+set_check kernel ${KERNEL_MTREE}
+set_check base ${BASE_MTREE}
 echo ">>> Check for and install missing package dependencies" >> ${PKG_PROGRESS_FILE}
 pkg check -da >> ${PKG_PROGRESS_FILE} 2>&1
 echo ">>> Check for missing or altered package files" >> ${PKG_PROGRESS_FILE}
diff --git a/src/opnsense/scripts/firmware/sets.sh b/src/opnsense/scripts/firmware/sets.sh
index 0fd0cc666..c38f5f514 100755
--- a/src/opnsense/scripts/firmware/sets.sh
+++ b/src/opnsense/scripts/firmware/sets.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2017 Franco Fichtner <franco@opnsense.org>
+# Copyright (C) 2017-2018 Franco Fichtner <franco@opnsense.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,11 +25,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 LIC="BSD2CLAUSE"
-OS="FreeBSD"
+OS="HardenedBSD"
 SEP=${1:-","}
 
-BV=$(opnsense-update -bv)
-KV=$(opnsense-update -kv)
+BV=$(opnsense-version -vp base)
+KV=$(opnsense-version -vp kernel)
+
+BS=$(opnsense-version -sp base)
+KS=$(opnsense-version -sp kernel)
 
 BL=0
 KL=0
@@ -37,5 +40,5 @@ KL=0
 opnsense-update -Tb || BL=1
 opnsense-update -Tk || KL=1
 
-echo "base${SEP}${BV%-*}${SEP}${OS} userland set${SEP}${SEP}${BL}${SEP}${LIC}"
-echo "kernel${SEP}${KV%-*}${SEP}${OS} kernel set${SEP}${SEP}${KL}${SEP}${LIC}"
+echo "base${SEP}${BV%-*}${SEP}${OS} userland set${SEP}${BS}${SEP}${BL}${SEP}${LIC}"
+echo "kernel${SEP}${KV%-*}${SEP}${OS} kernel set${SEP}${BS}${SEP}${KL}${SEP}${LIC}"