diff options
author | Jim P <jim@pingle.org> | 2013-02-01 07:08:32 -0800 |
---|---|---|
committer | Jim P <jim@pingle.org> | 2013-02-01 07:08:32 -0800 |
commit | 69efe7c67f252680d36e5e36698cd899a663c0d2 (patch) | |
tree | d597f5ac00a276db4d3e96d6e8beff1f01125cc9 | |
parent | 53bc1f3868c6e5f10baab813bff78e519b35db8d (diff) | |
parent | b328217211d0fc34097c355b10389493631691ef (diff) | |
download | pfsense-69efe7c67f252680d36e5e36698cd899a663c0d2.zip pfsense-69efe7c67f252680d36e5e36698cd899a663c0d2.tar.gz |
Merge pull request #365 from phil-davis/master
Allow clear package lock when 1st install fails
-rwxr-xr-x | usr/local/www/diag_backup.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index d84a501..e869fec 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"> </td> </tr> @@ -746,12 +746,16 @@ function backuparea_change(obj) { <tr> <td width="22%" valign="baseline" class="vncell"> </td> <td width="78%" class="vtable"> - <p><?=gettext("Click this button to reinstall all system packages. This may take a while."); ?> <br /><br /> - <input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="<?=gettext("Reinstall packages"); ?>"> - <br/> - <br/> - <p><?=gettext("Click this button to clear the package lock if a package fails to reinstall properly after an upgrade."); ?> <br /><br /> - <input name="Submit" type="submit" class="formbtn" id="clearpackagelock" value="<?=gettext("Clear Package Lock"); ?>"> + <?php if ($config['installedpackages']['package'] != "") { ?> + <p><?=gettext("Click this button to reinstall all system packages. This may take a while."); ?> <br /><br /> + <input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="<?=gettext("Reinstall packages"); ?>"> + <br/> + <br/> + <?php } ?> + <?php if (is_subsystem_dirty("packagelock")) { ?> + <p><?=gettext("Click this button to clear the package lock if a package fails to reinstall properly after an upgrade."); ?> <br /><br /> + <input name="Submit" type="submit" class="formbtn" id="clearpackagelock" value="<?=gettext("Clear Package Lock"); ?>"> + <?php } ?> </td> </tr> <?php } ?> |