summaryrefslogtreecommitdiffstats
path: root/src/usr/local/sbin/pfSense-upgrade
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-04-05 21:51:24 -0300
committerRenato Botelho <renato@netgate.com>2016-04-05 21:52:16 -0300
commit967794d2f477ba7cb0dc7706bf6203dd90b9e4f0 (patch)
tree90485dd3ec53f96d043ba53e95d9771bc3171daf /src/usr/local/sbin/pfSense-upgrade
parentdb8621d8f4d6e36d1d6c14346dfd0afaff7903c3 (diff)
downloadpfsense-967794d2f477ba7cb0dc7706bf6203dd90b9e4f0.zip
pfsense-967794d2f477ba7cb0dc7706bf6203dd90b9e4f0.tar.gz
Add a workaround on pfSense-upgrade to make sure repo package is replaced by correct one
(cherry picked from commit a491ec98d8ffc5663cca84df402c2d6274a78a07)
Diffstat (limited to 'src/usr/local/sbin/pfSense-upgrade')
-rwxr-xr-xsrc/usr/local/sbin/pfSense-upgrade7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index de83de1..d1daf2e 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -294,6 +294,13 @@ pkg_upgrade() {
local _repo_pkg="${product}-repo"
+ # Deprecated pa
+ if is_pkg_installed ${product}-repo-devel; then
+ _exec "pkg ${pkg_chroot} set -A 1 ${product}-repo-devel" \
+ "Scheduling package ${product}-repo-devel for removal"
+ _exec "pkg install ${_repo_pkg}" "Installing ${_repo_pkg}" mute
+ fi
+
if [ "$(compare_pkg_version ${_repo_pkg})" = "<" ]; then
cp /usr/local/etc/pkg/repos/${product}.conf \
/tmp/${product}.conf.copy
OpenPOWER on IntegriCloud