From b6c72ae2c3c3d366e0dafe7337a8b2c4738df8ac Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Tue, 29 Sep 2015 14:12:34 -0300
Subject: Detect when pkg must be upgraded and do it early, followed by a pkg
 update to make sure metadata is updated

---
 src/usr/local/sbin/pfSense-upgrade | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/usr/local/sbin')

diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index c30f257..9f22bd2 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -138,6 +138,11 @@ pkg_upgrade_first_step() {
 		_exit 1
 	fi
 
+	if [ "$(compare_pkg_version pkg)" = "<" ]; then
+		_exec "pkg upgrade pkg" "Upgrading pkg" mute
+		pkg_update force
+	fi
+
 	kernel_version_compare=$(compare_pkg_version ${kernel_pkg})
 
 	if [ "${kernel_version_compare}" = "<" ]; then
-- 
cgit v1.1