summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-12-07 13:15:27 -0200
committerRenato Botelho <renato@netgate.com>2015-12-07 13:15:27 -0200
commit6acf887ff35141803b8503ac9609863250a0bf62 (patch)
tree37cc8a42e4f4e94282c8d2d5a867db99a234610c /src/usr
parentae1fa3d741d56a6c2ee97682d677fe3a49e8b3a4 (diff)
parente6068346cc5c8f858f381c2cdfa4986ec0ec8b0d (diff)
downloadpfsense-6acf887ff35141803b8503ac9609863250a0bf62.zip
pfsense-6acf887ff35141803b8503ac9609863250a0bf62.tar.gz
Merge pull request #2167 from phil-davis/pkgsync23
Diffstat (limited to 'src/usr')
-rwxr-xr-xsrc/usr/local/share/pfSense/post_upgrade_command2
-rw-r--r--src/usr/local/www/diag_backup.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/share/pfSense/post_upgrade_command b/src/usr/local/share/pfSense/post_upgrade_command
index 4a63a31..1a3e968 100755
--- a/src/usr/local/share/pfSense/post_upgrade_command
+++ b/src/usr/local/share/pfSense/post_upgrade_command
@@ -5,7 +5,7 @@
PFSENSETYPE=`cat /etc/platform`
if [ "${PFSENSETYPE}" = "pfSense" -o "${PFSENSETYPE}" = "nanobsd" ]; then
- touch /conf/needs_package_sync
+ touch /conf/needs_package_sync_after_reboot
fi
if [ "${PFSENSETYPE}" = "nanobsd" ]; then
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