From 01789906a2589ea96fd06faf47ea19e0c2262a03 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 2 May 2016 13:44:13 -0300
Subject: Reboot after upgrade when meta package version changed

---
 src/usr/local/sbin/pfSense-upgrade | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/usr/local/sbin/pfSense-upgrade')

diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index bc36d32..59ef1fd 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -332,6 +332,7 @@ pkg_upgrade() {
 			_exit 0
 		fi
 
+		local _meta_pkg=$(get_meta_pkg_name)
 		if [ $(pkg upgrade -r ${product}-core -nq | wc -l) -gt 1 ]; then
 			if [ "${platform}" = "nanobsd" ]; then
 				_echo "**** WARNING ****"
@@ -355,6 +356,8 @@ pkg_upgrade() {
 				setup_nanobsd_env
 			fi
 			need_reboot=1
+		elif pkg upgrade -r ${product} -nq ${_meta_pkg} >/dev/null 2>&1; then
+			need_reboot=1
 		fi
 
 		pkg_unlock ${kernel_pkg}
@@ -469,16 +472,20 @@ pkg_upgrade() {
 	fi
 }
 
-check_upgrade() {
+get_meta_pkg_name() {
 	# figure out main meta package name
 	if is_pkg_installed ${product}-vmware; then
-		local _meta_pkg="${product}-vmware"
+		echo "${product}-vmware"
 	elif is_pkg_installed ${product}; then
-		local _meta_pkg="${product}"
+		echo "${product}"
 	else
 		_echo "ERROR: It was not possible to identify which ${product} meta package is installed"
 		_exit 1
 	fi
+}
+
+check_upgrade() {
+	local _meta_pkg=$(get_meta_pkg_name)
 
 	pkg_update
 
-- 
cgit v1.1