summaryrefslogtreecommitdiffstats
path: root/usr/local/www/diag_backup.php
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@world.inf.org>2013-02-01 11:51:48 +0545
committerPhil Davis <phil.davis@world.inf.org>2013-02-01 11:51:48 +0545
commite27953e73a41c644717708c1e7ace02800c7fc4b (patch)
tree056817ba0744588f7df24100e8438b4b0c14b227 /usr/local/www/diag_backup.php
parent8f563bb423ab8a1c06a191b5fc772a260b042360 (diff)
downloadpfsense-e27953e73a41c644717708c1e7ace02800c7fc4b.zip
pfsense-e27953e73a41c644717708c1e7ace02800c7fc4b.tar.gz
Allow clear package lock when 1st install fails
I upgraded a system this morning. An issue during the 1st package reinstall caused the package lock to be set, but no packages installed. The Backup/Restore GUI page did not show the section for resetting the package lock, because it only displays that if there is at least 1 package installed - catch-22. This fixes that odd condition.
Diffstat (limited to 'usr/local/www/diag_backup.php')
-rwxr-xr-xusr/local/www/diag_backup.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index d84a501..5bc538e 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -736,7 +736,7 @@ function backuparea_change(obj) {
<p><strong><span class="red"><?=gettext("Note:"); ?></span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p>
</td>
</tr>
- <?php if($config['installedpackages']['package'] != "") { ?>
+ <?php if(($config['installedpackages']['package'] != "") || (is_subsystem_dirty("packagelock"))) { ?>
<tr>
<td colspan="2" class="list" height="12">&nbsp;</td>
</tr>
OpenPOWER on IntegriCloud