summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2014-12-18 17:39:55 +0545
committerPhil Davis <phil.davis@inf.org>2014-12-18 17:39:55 +0545
commit1a2ea2cc491728fd9d72a6cadffa5846f3635dcb (patch)
tree0cba6e4437f2b2e6e83f282e7dd8b30163a0a032
parent2ccdd739d99deb565a8185b21e950ccdad121b0f (diff)
downloadpfsense-1a2ea2cc491728fd9d72a6cadffa5846f3635dcb.zip
pfsense-1a2ea2cc491728fd9d72a6cadffa5846f3635dcb.tar.gz
Display better message when booting and awaiting package reinstall
-rw-r--r--usr/local/www/index.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 9f4d454..7041b72 100644
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -145,11 +145,10 @@ if (!is_array($config['widgets'])) {
if(file_exists('/conf/needs_package_sync')) {
if($config['installedpackages'] <> '' && is_array($config['installedpackages']['package'])) {
if($g['platform'] == "pfSense" || $g['platform'] == "nanobsd") {
- if (platform_booting()) {
- ## User has logged into webGUI quickly while system is booting.
- ## The package reinstall will be done by the boot script real soon now.
- ## The code in fbegin.inc will put up the reinstalling notice.
- } else {
+ ## If the user has logged into webGUI quickly while the system is booting then do not redirect them to
+ ## the package reinstall page. That is about to be done by the boot script anyway.
+ ## The code in fbegin.inc will put up a notice to the user.
+ if (!platform_booting()) {
header('Location: pkg_mgr_install.php?mode=reinstallall');
exit;
}
OpenPOWER on IntegriCloud