summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/diag_backup.php
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-12-07 11:37:54 +0545
committerPhil Davis <phil.davis@inf.org>2015-12-07 11:37:54 +0545
commite6068346cc5c8f858f381c2cdfa4986ec0ec8b0d (patch)
tree1816c7ba2a5c31e0bddedb1ecaf1784d2ce54550 /src/usr/local/www/diag_backup.php
parentd315b34169bc6aec22d8d55aa38223b9cd71c57b (diff)
downloadpfsense-e6068346cc5c8f858f381c2cdfa4986ec0ec8b0d.zip
pfsense-e6068346cc5c8f858f381c2cdfa4986ec0ec8b0d.tar.gz
Redmine #4279 Package reinstall displayed when shutting down before upgrade
Use a different flag file to indicate that a package reinstall is required after a reboot is done first. This avoids the possibility that the user navigates in the webGUI during the time while the shutdown is in progress and is accidentally presented with the reinstall all packages GUI button. Early in rc.bootup switch the flag file to use its ordinary name, so that all subsequent code in boot scripts and webGUI will work as it already does to handle the package reinstall and notifying the user that a package reinstall is about to be done or in progress...
Diffstat (limited to 'src/usr/local/www/diag_backup.php')
-rw-r--r--src/usr/local/www/diag_backup.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php
index 7e75e7e..c236ac3 100644
--- a/src/usr/local/www/diag_backup.php
+++ b/src/usr/local/www/diag_backup.php
@@ -372,7 +372,7 @@ if ($_POST) {
/* this will be picked up by /index.php */
conf_mount_rw();
mark_subsystem_dirty("restore");
- touch("/conf/needs_package_sync");
+ touch("/conf/needs_package_sync_after_reboot");
/* remove cache, we will force a config reboot */
if (file_exists("{$g['tmp_path']}/config.cache")) {
unlink("{$g['tmp_path']}/config.cache");
OpenPOWER on IntegriCloud