From 82e52b528fbd6ab11965f9a4f87982d3a67b5633 Mon Sep 17 00:00:00 2001 From: jim-p Date: Thu, 3 Oct 2013 10:00:10 -0400 Subject: Avoid starting cron multiple times, and make sure to stop all running cron processes and not just the one we have a PID for. --- config/cron/cron.inc | 4 ++-- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/cron/cron.inc b/config/cron/cron.inc index 88388b3c..2fe9cf57 100644 --- a/config/cron/cron.inc +++ b/config/cron/cron.inc @@ -81,8 +81,8 @@ function cron_install_command() write_rcfile(array( "file" => "cron.sh", - "start" => "/usr/sbin/cron -s &", - "stop" => "[ -f \"/var/run/cron.pid\" ] && kill -9 `cat /var/run/cron.pid`; rm -f /var/run/cron.pid;" + "start" => "[ `/bin/pgrep -f 'cron -s' | wc -l` -eq 0 ] && /usr/sbin/cron -s &", + "stop" => "[ -f \"/var/run/cron.pid\" ] && kill -9 `cat /var/run/cron.pid`; rm -f /var/run/cron.pid; /bin/pkill -f 'cron -s'" ) ); diff --git a/pkg_config.8.xml b/pkg_config.8.xml index c0f7d317..95b1b7f8 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -453,7 +453,7 @@ http://www.pfsense.com/packages/config/cron/cron.xml http://files.pfsense.org/packages/8/All/ - 0.1.7 + 0.1.8 Beta 1.2 markjcrane@gmail.com diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 5a587336..4ba2450e 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -440,7 +440,7 @@ http://www.pfsense.com/packages/config/cron/cron.xml http://files.pfsense.org/packages/amd64/8/All/ - 0.1.7 + 0.1.8 Beta 1.2 markjcrane@gmail.com -- cgit v1.2.3