summaryrefslogtreecommitdiffstats
path: root/src/etc/rc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-10-07 15:51:39 -0300
committerRenato Botelho <renato@netgate.com>2015-10-07 15:51:57 -0300
commita5733f637ce17b7ff5c3c51410739a9bbec62202 (patch)
tree51ebb1e693718fd2efb799eb0b99a76b9f06e766 /src/etc/rc
parent366d1482fa2d28e77005543a3bfb9061a1fa6977 (diff)
downloadpfsense-a5733f637ce17b7ff5c3c51410739a9bbec62202.zip
pfsense-a5733f637ce17b7ff5c3c51410739a9bbec62202.tar.gz
Rework pfSense-upgrade script to make it work with nanobsd
Diffstat (limited to 'src/etc/rc')
-rwxr-xr-xsrc/etc/rc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/etc/rc b/src/etc/rc
index a0531c9..b7cefb4 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -341,11 +341,8 @@ echo "done."
# Recreate capabilities DB
/usr/bin/cap_mkdb /etc/login.conf
-# Finish update
-if [ -f /cf/conf/upgrade_in_progress ]; then
- echo "Running second stage of upgrade process..."
- /usr/local/sbin/${product}-upgrade -y
-fi
+# Second upgrade stage
+/usr/local/sbin/${product}-upgrade -y -b 2
# Run the php.ini setup file and populate
# /usr/local/etc/php.ini and /usr/local/lib/php.ini
@@ -421,6 +418,8 @@ if [ "${GMIRROR_STATUS}" != "" ]; then
/usr/local/bin/minicron 60 /var/run/gmirror_status_check.pid /usr/local/sbin/gmirror_status_check.php
fi
+/usr/local/sbin/${product}-upgrade -y -b 3
+
# Log product version to syslog
BUILDTIME=`cat /etc/version.buildtime`
ARCH=`uname -m`
OpenPOWER on IntegriCloud