diff options
| -rwxr-xr-x | etc/rc.bootup | 6 | ||||
| -rwxr-xr-x | etc/rc.firmware | 2 | ||||
| -rw-r--r-- | usr/local/www/diag_backup.php | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/etc/rc.bootup b/etc/rc.bootup index d2f0b82..f690f00 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -141,6 +141,12 @@ system_check_reset_button(); if (file_exists("/root/firmware.tgz")) unlink("/root/firmware.tgz"); +/* Reinstall of packages after reboot has been requested */ +if (file_exists('/conf/needs_package_sync_after_reboot')) { + touch('/conf/needs_package_sync'); + @unlink('/conf/needs_package_sync_after_reboot'); +} + /* start devd (dhclient now uses it) */ echo "Starting device manager (devd)..."; mute_kernel_msgs(); diff --git a/etc/rc.firmware b/etc/rc.firmware index 0b6f3ed..e5f8310 100755 --- a/etc/rc.firmware +++ b/etc/rc.firmware @@ -365,7 +365,7 @@ pfSenseNanoBSDupgrade) echo "" >> /conf/upgrade_log.txt # Trigger a package reinstallation on reboot - touch /conf/needs_package_sync + touch /conf/needs_package_sync_after_reboot # remount /cf ro /etc/rc.conf_mount_ro 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"); |
