From b4929f5332016e91b5d185a98c089cf44f1c6714 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 7 Oct 2019 11:13:07 +0200
Subject: [PATCH] firmware: use opnsense-revert to reinstall

Since the health check complains about a lot of different things
and opnsense-revert can repair most of it it is only fair to offer
this fix through GUI reinstall buttons via opnsense-revert for
an overly pleasing UX.
---
 src/opnsense/scripts/firmware/reinstall.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/opnsense/scripts/firmware/reinstall.sh b/src/opnsense/scripts/firmware/reinstall.sh
index 3e4d3c6a3..fe751f38f 100755
--- a/src/opnsense/scripts/firmware/reinstall.sh
+++ b/src/opnsense/scripts/firmware/reinstall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015-2017 Franco Fichtner <franco@opnsense.org>
+# Copyright (C) 2015-2019 Franco Fichtner <franco@opnsense.org>
 # Copyright (C) 2014 Deciso B.V.
 # All rights reserved.
 #
@@ -26,13 +26,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress
-PACKAGE=$1
+PACKAGE=${1}
 REBOOT=
 
 # Truncate upgrade progress file
 : > ${PKG_PROGRESS_FILE}
 
-echo "***GOT REQUEST TO REINSTALL: $PACKAGE***" >> ${PKG_PROGRESS_FILE}
+echo "***GOT REQUEST TO REINSTALL: ${PACKAGE}***" >> ${PKG_PROGRESS_FILE}
 
 if [ "${PACKAGE}" = "base" ]; then
 	if opnsense-update -Tb; then
@@ -55,7 +55,7 @@ elif [ "${PACKAGE}" = "kernel" ]; then
 		opnsense-update -k >> ${PKG_PROGRESS_FILE} 2>&1
 	fi
 else
-	pkg install -yf $PACKAGE >> ${PKG_PROGRESS_FILE} 2>&1
+	opnsense-revert ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
 	pkg autoremove -y >> ${PKG_PROGRESS_FILE} 2>&1
 fi