From b2bb49709d6d1cb845f2c7caf40bebe375ecb2d7 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 20 Jan 2017 13:58:22 -0500 Subject: 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. --- src/usr/local/www/system_advanced_misc.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/usr/local/www/system_advanced_misc.php') 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(); -- cgit v1.1