summaryrefslogtreecommitdiffstats
path: root/usr/local/www/fbegin.inc
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@dds.nl>2011-01-26 15:40:32 +0100
committerSeth Mos <seth.mos@dds.nl>2011-01-26 15:40:32 +0100
commit9740fad81dce0f9389f157ac739473d17ad67839 (patch)
treec71eeae7d425f0bc7c42ded5b9dcbb904a44cce5 /usr/local/www/fbegin.inc
parent2259901018552f8a8432e295b8d6064fa918cda0 (diff)
parentee4fc984e1169a180457b3a10e011fab04fd0f31 (diff)
downloadpfsense-9740fad81dce0f9389f157ac739473d17ad67839.zip
pfsense-9740fad81dce0f9389f157ac739473d17ad67839.tar.gz
Merge remote branch 'upstream/master'
Conflicts: etc/inc/system.inc
Diffstat (limited to 'usr/local/www/fbegin.inc')
-rwxr-xr-xusr/local/www/fbegin.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index c2d5955..2b3da3b 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -426,5 +426,10 @@ function add_to_menu($url, $name) {
<br />
<?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'>");
+}
$pgtitle_output = true;
?>
OpenPOWER on IntegriCloud