diff options
author | jim-p <jimp@pfsense.org> | 2017-01-20 13:58:22 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2017-01-20 14:13:24 -0500 |
commit | b2bb49709d6d1cb845f2c7caf40bebe375ecb2d7 (patch) | |
tree | 461858060af6e75b86c1b0e3a933960ae579c508 /src/usr | |
parent | df1dcfa5478ecce39a952af8a01534285431bb3f (diff) | |
download | pfsense-b2bb49709d6d1cb845f2c7caf40bebe375ecb2d7.zip pfsense-b2bb49709d6d1cb845f2c7caf40bebe375ecb2d7.tar.gz |
Add a parameter to install_cron_job to stop it from performing its own write_config. Adjust base system calls to match. Ticket #7146
Packages may still need the old behavior but need tested individually. Once all function calls are confirmed to work without the write, the write_config parameter and call can be removed from this function for good.
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/system_advanced_firewall.php | 6 | ||||
-rw-r--r-- | src/usr/local/www/system_advanced_misc.php | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php index c5a9d36..3fc3b10 100644 --- a/src/usr/local/www/system_advanced_firewall.php +++ b/src/usr/local/www/system_advanced_firewall.php @@ -335,15 +335,15 @@ if ($_POST) { if ($_POST['bogonsinterval'] != $config['system']['bogons']['interval']) { switch ($_POST['bogonsinterval']) { case 'daily': - install_cron_job("/usr/bin/nice -n20 /etc/rc.update_bogons.sh", true, "1", "3", "*", "*", "*"); + install_cron_job("/usr/bin/nice -n20 /etc/rc.update_bogons.sh", true, "1", "3", "*", "*", "*", "root", false); break; case 'weekly': - install_cron_job("/usr/bin/nice -n20 /etc/rc.update_bogons.sh", true, "1", "3", "*", "*", "0"); + install_cron_job("/usr/bin/nice -n20 /etc/rc.update_bogons.sh", true, "1", "3", "*", "*", "0", "root", false); break; case 'monthly': // fall through default: - install_cron_job("/usr/bin/nice -n20 /etc/rc.update_bogons.sh", true, "1", "3", "1", "*", "*"); + install_cron_job("/usr/bin/nice -n20 /etc/rc.update_bogons.sh", true, "1", "3", "1", "*", "*", "root", false); } $config['system']['bogons']['interval'] = $_POST['bogonsinterval']; } diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php index 6e997a0..9665a6e 100644 --- a/src/usr/local/www/system_advanced_misc.php +++ b/src/usr/local/www/system_advanced_misc.php @@ -263,13 +263,15 @@ if ($_POST) { // Remove the cron jobs on full install if not using RAM disk. // Add the cron jobs on all others if the periodic backup option is set. Otherwise the cron job is removed. if (!isset($config['system']['use_mfs_tmpvar'])) { - install_cron_job("/etc/rc.backup_rrd.sh", false); - install_cron_job("/etc/rc.backup_dhcpleases.sh", false); - install_cron_job("/etc/rc.backup_logs.sh", false); + /* See #7146 for detail on why the extra parameters are needed for the time being. */ + install_cron_job("/etc/rc.backup_rrd.sh", false, null, null, null, null, null, null, false); + install_cron_job("/etc/rc.backup_dhcpleases.sh", false, null, null, null, null, null, null, false); + install_cron_job("/etc/rc.backup_logs.sh", false, null, null, null, null, null, null, false); } else { - install_cron_job("/etc/rc.backup_rrd.sh", ($config['system']['rrdbackup'] > 0), $minute="0", "*/{$config['system']['rrdbackup']}"); - install_cron_job("/etc/rc.backup_dhcpleases.sh", ($config['system']['dhcpbackup'] > 0), $minute="0", "*/{$config['system']['dhcpbackup']}"); - install_cron_job("/etc/rc.backup_logs.sh", ($config['system']['logsbackup'] > 0), $minute="0", "*/{$config['system']['logsbackup']}"); + /* See #7146 for detail on why the extra parameters are needed for the time being. */ + install_cron_job("/etc/rc.backup_rrd.sh", ($config['system']['rrdbackup'] > 0), $minute="0", "*/{$config['system']['rrdbackup']}", null, null, null, null, false); + install_cron_job("/etc/rc.backup_dhcpleases.sh", ($config['system']['dhcpbackup'] > 0), $minute="0", "*/{$config['system']['dhcpbackup']}", null, null, null, null, false); + install_cron_job("/etc/rc.backup_logs.sh", ($config['system']['logsbackup'] > 0), $minute="0", "*/{$config['system']['logsbackup']}", null, null, null, null, false); } write_config(); |