diff options
| author | jim-p <jimp@pfsense.org> | 2013-10-03 10:00:10 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-10-03 10:00:51 -0400 |
| commit | 82e52b528fbd6ab11965f9a4f87982d3a67b5633 (patch) | |
| tree | ed411cd5e7f9299e2c0c63f41f2fd6c9d4efd809 | |
| parent | 31e1e189d5600b363842263bbfe5f38cff7fa66c (diff) | |
| download | pfsense-packages-82e52b528fbd6ab11965f9a4f87982d3a67b5633.tar.gz pfsense-packages-82e52b528fbd6ab11965f9a4f87982d3a67b5633.tar.bz2 pfsense-packages-82e52b528fbd6ab11965f9a4f87982d3a67b5633.zip | |
Avoid starting cron multiple times, and make sure to stop all running cron processes and not just the one we have a PID for.
| -rw-r--r-- | config/cron/cron.inc | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | 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 @@ <pkginfolink></pkginfolink> <config_file>http://www.pfsense.com/packages/config/cron/cron.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> - <version>0.1.7</version> + <version>0.1.8</version> <status>Beta</status> <required_version>1.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> 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 @@ <pkginfolink></pkginfolink> <config_file>http://www.pfsense.com/packages/config/cron/cron.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <version>0.1.7</version> + <version>0.1.8</version> <status>Beta</status> <required_version>1.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> |