From 73e4bf68ebca91e9f2716d0b68c499455a749edf Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 1 Feb 2016 10:15:10 -0200
Subject: Respect ALL_PACKAGES for package removal

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

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

diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index 665f1b7..540c587 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -639,6 +639,17 @@ pkg_delete() {
 	_exec "pkg autoremove" "Removing stale packages" mute ignore_result
 }
 
+# Delete every pfSense-pkg-* package
+pkg_delete_all() {
+	for _pkg in $(pkg query -e '%a == 0' %n); do
+		case ${_pkg} in "${pkg_prefix}"* )
+			_echo "Removing ${_pkg}"
+			pkg_delete ${_pkg}
+			;;
+		esac
+	done
+}
+
 # Reinstall every pfSense-pkg-* package
 pkg_reinstall_all() {
 	for _pkg in $(pkg query -e '%a == 0' %n); do
@@ -849,7 +860,11 @@ case "${action}" in
 		fi
 		;;
 	delete)
-		pkg_delete ${action_pkg}
+		if [ ${action_pkg} == "ALL_PACKAGES" ] && [ -n ${force} ]; then
+			pkg_delete_all
+		else
+			pkg_delete ${action_pkg}
+		fi
 		;;
 	*)
 		_echo "ERROR: Invalid action!"
-- 
cgit v1.1