summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2014-12-18 10:07:45 +0545
committerPhil Davis <phil.davis@inf.org>2014-12-18 10:07:45 +0545
commit8aec06e03c8ed2dc9169d848ba0049043ffe35b3 (patch)
tree52ab00c3b3b09406849a311fc0459c89e1af41d0 /usr/local
parenta03551c249d66e2d2c67eb9bed543c0fabbf1953 (diff)
downloadpfsense-8aec06e03c8ed2dc9169d848ba0049043ffe35b3.zip
pfsense-8aec06e03c8ed2dc9169d848ba0049043ffe35b3.tar.gz
Display better message when booting and awaiting package reinstall
Diffstat (limited to 'usr/local')
-rw-r--r--usr/local/www/index.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 57aee4a..9f4d454 100644
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -145,8 +145,14 @@ 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") {
- header('Location: pkg_mgr_install.php?mode=reinstallall');
- exit;
+ 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 {
+ header('Location: pkg_mgr_install.php?mode=reinstallall');
+ exit;
+ }
}
} else {
conf_mount_rw();
OpenPOWER on IntegriCloud