diff options
| author | Phil Davis <phil.davis@inf.org> | 2014-12-18 10:09:45 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2014-12-18 10:09:45 +0545 |
| commit | 2ccdd739d99deb565a8185b21e950ccdad121b0f (patch) | |
| tree | 658bcf55a1e0cd33309c5e8e9ca1904980857689 /usr/local | |
| parent | 8aec06e03c8ed2dc9169d848ba0049043ffe35b3 (diff) | |
| download | pfsense-2ccdd739d99deb565a8185b21e950ccdad121b0f.zip pfsense-2ccdd739d99deb565a8185b21e950ccdad121b0f.tar.gz | |
Display better message when booting and awaiting package reinstall
Diffstat (limited to 'usr/local')
| -rwxr-xr-x | usr/local/www/fbegin.inc | 11 |
1 files changed, 8 insertions, 3 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; ?> |
