From 2a4c3a4869446a016675da4e2d9a5f20100eb2cd Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 15 Nov 2021 13:35:14 +0100
Subject: [PATCH] firmware: add a configuration file and fix prompt hint

---
 plist                                      | 1 +
 src/etc/opnsense-update.conf.in            | 4 ++++
 src/opnsense/data/firmware/upgrade.html.in | 2 +-
 src/opnsense/scripts/firmware/check.sh     | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 src/etc/opnsense-update.conf.in

diff --git a/plist b/plist
index 130fc672b..d1fd7a28a 100644
--- a/plist
+++ b/plist
@@ -67,6 +67,7 @@
 /usr/local/etc/opnsense-beep.d/low
 /usr/local/etc/opnsense-beep.d/start
 /usr/local/etc/opnsense-beep.d/stop
+/usr/local/etc/opnsense-update.conf
 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20150402
 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20160104
 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20160630
diff --git a/src/etc/opnsense-update.conf.in b/src/etc/opnsense-update.conf.in
new file mode 100644
index 000000000..252e8504d
--- /dev/null
+++ b/src/etc/opnsense-update.conf.in
@@ -0,0 +1,4 @@
+# configuration for opnsense-update(8), do not edit
+
+UPGRADE_HINT="FreeBSD:13:%%CORE_ARCH%%/22.1"
+UPGRADE_RELEASE="22.1.b1"
diff --git a/src/opnsense/data/firmware/upgrade.html.in b/src/opnsense/data/firmware/upgrade.html.in
index 6f689c37c..bfb8a6816 100644
--- a/src/opnsense/data/firmware/upgrade.html.in
+++ b/src/opnsense/data/firmware/upgrade.html.in
@@ -5,7 +5,7 @@ seamless and can be performed right here from the web GUI.</p>
 which will retain your settings (selecting "Import Configuration"), then
 reformat the disk and apply a clean system (selecting "Guided Installation").</p>
 <p>You can also upgrade via console / SSH by using option 12 from the menu by
-typing "%%CORE_NEXT%%" when prompted.</p>
+typing "%%UPGRADE_RELEASE%%" when prompted.</p>
 <p>Make sure to read the migration notes and adjust for possible minor breaking
 changes.</p>
 <p>Please backup your configuration, preview the new version via live image or
diff --git a/src/opnsense/scripts/firmware/check.sh b/src/opnsense/scripts/firmware/check.sh
index 2997e40c4..2de310b45 100755
--- a/src/opnsense/scripts/firmware/check.sh
+++ b/src/opnsense/scripts/firmware/check.sh
@@ -338,8 +338,8 @@ fi
 
 packages_is_size="$(opnsense-update -SRp)"
 if [ -n "${packages_is_size}" ]; then
-    upgrade_major_message=$(cat /usr/local/opnsense/data/firmware/upgrade.html 2> /dev/null | sed 's/"/\\&/g' | tr '\n' ' ')
     upgrade_major_version=$(opnsense-update -vR)
+    upgrade_major_message=$(sed -e 's/"/\\&/g' -e "s/%%UPGRADE_RELEASE%%/${upgrade_major_version}/g" /usr/local/opnsense/data/firmware/upgrade.html 2> /dev/null | tr '\n' ' ')
     upgrade_needs_reboot="1"
     sets_upgraded="{\"name\":\"packages\",\"size\":\"${packages_is_size}\",\"current_version\":\"${product_version}\",\"new_version\":\"${upgrade_major_version}\",\"repository\":\"${product_repo}\"}"