summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2014-12-22 17:45:49 -0600
committerChris Buechler <cmb@pfsense.org>2014-12-22 17:45:49 -0600
commitdc83dd4ca9da8b9e4fcffd8a49d9175e47273d9f (patch)
tree4d96750728d99e0475219b4c0c602a36655b97a0 /usr/local
parentf2087b77d82352de5230c5f429d9dbfb74bee140 (diff)
parent1a2ea2cc491728fd9d72a6cadffa5846f3635dcb (diff)
downloadpfsense-dc83dd4ca9da8b9e4fcffd8a49d9175e47273d9f.zip
pfsense-dc83dd4ca9da8b9e4fcffd8a49d9175e47273d9f.tar.gz
Merge pull request #1393 from phil-davis/patch-12
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/fbegin.inc11
-rw-r--r--usr/local/www/index.php9
2 files changed, 15 insertions, 5 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index 531df4c..9379885 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -433,9 +433,14 @@ echo get_shortcut_log_link($shortcut_section, true);
<?php
/* if upgrade in progress, alert user */
-if(is_subsystem_dirty('packagelock')) {
- $pgtitle = array(gettext("System"),gettext("Package Manager"));
- print_info_box(gettext("Packages are currently being reinstalled in the background.<p>Do not make changes in the GUI until this is complete.") . "<p><img src='/themes/{$g['theme']}/images/icons/icon_fw-update.gif' alt='firmware update' />");
+if (is_subsystem_dirty('packagelock') || (file_exists('/conf/needs_package_sync') && platform_booting())) {
+ if (file_exists('/conf/needs_package_sync') && platform_booting()) {
+ $info_text = sprintf(gettext("%s is booting then packages will be reinstalled in the background.<p>Do not make changes in the GUI until this is complete."), $g['product_name']);
+ } else {
+ $pgtitle = array(gettext("System"),gettext("Package Manager"));
+ $info_text = gettext("Packages are currently being reinstalled in the background.<p>Do not make changes in the GUI until this is complete.");
+ }
+ print_info_box($info_text . "<p><img src='/themes/{$g['theme']}/images/icons/icon_fw-update.gif' alt='firmware update' />");
}
$pgtitle_output = true;
?>
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 57aee4a..7041b72 100644
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -145,8 +145,13 @@ 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 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;
+ }
}
} else {
conf_mount_rw();
OpenPOWER on IntegriCloud