summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-12-07 11:14:16 +0545
committerPhil Davis <phil.davis@inf.org>2015-12-07 11:14:16 +0545
commit6ae579b56038775641a1ab3b9ea56a05d244955c (patch)
tree43cdf031b355fbb32320fc3231d8984eab97e3ea /usr
parent2bfa7dbfb4fe8981c84d03d417b7c486a0973ea5 (diff)
downloadpfsense-6ae579b56038775641a1ab3b9ea56a05d244955c.zip
pfsense-6ae579b56038775641a1ab3b9ea56a05d244955c.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 'usr')
-rw-r--r--usr/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 a83bdab..ddab190 100644
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -407,7 +407,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