summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-12-11 07:31:21 -0200
committerRenato Botelho <renato@netgate.com>2015-12-11 07:31:21 -0200
commit941939ee1fbf588395604f0c2805a0f3d4c30231 (patch)
tree57cc341bc21a710a6dedc44af6643dcebb4356cd
parent5db366dc2aad7ec06cb788ce0d95c68f73e4418d (diff)
parentf5ed821f270627848646f9921b407724ad72ac0b (diff)
downloadpfsense-941939ee1fbf588395604f0c2805a0f3d4c30231.zip
pfsense-941939ee1fbf588395604f0c2805a0f3d4c30231.tar.gz
Merge pull request #2205 from phil-davis/patch-2
-rwxr-xr-xsrc/usr/local/sbin/pfSense-upgrade6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index e747b0e..297476d 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -319,6 +319,8 @@ pkg_upgrade() {
_echo "Before starting the upgrade process, the currently mounted nanobsd partition"
_echo "needs to be cloned to the secondary partition, where the update will happen"
_echo ""
+ _echo "After installation a reboot will be required to switch partition."
+ _echo ""
if [ -z "${yes}" ]; then
_echo -n "Proceed with upgrade? (y/N) "
read answer
@@ -326,9 +328,11 @@ pkg_upgrade() {
_echo "Aborting..."
_exit 0
fi
+ # Do not make the user have to answer again.
+ yes=1
fi
+ setup_nanobsd_env
fi
- setup_nanobsd_env
need_reboot=1
fi
OpenPOWER on IntegriCloud