diff options
| author | jim-p <jimp@pfsense.org> | 2013-08-28 16:22:03 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-08-28 16:22:03 -0400 |
| commit | e3ffcea32677a506ecf142e427845ecae7451497 (patch) | |
| tree | 45fecada99f14f8f84340fd16e59e7f097ef1e77 | |
| parent | 429adb3b2dc66541670245bb63e0b952fda0617b (diff) | |
| download | pfsense-packages-e3ffcea32677a506ecf142e427845ecae7451497.tar.gz pfsense-packages-e3ffcea32677a506ecf142e427845ecae7451497.tar.bz2 pfsense-packages-e3ffcea32677a506ecf142e427845ecae7451497.zip | |
Don't try to (re)start services during boot.
| -rw-r--r-- | config/servicewatchdog/servicewatchdog.xml | 2 | ||||
| -rw-r--r-- | config/servicewatchdog/servicewatchdog_cron.php | 7 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/config/servicewatchdog/servicewatchdog.xml b/config/servicewatchdog/servicewatchdog.xml index 49556a01..3b2e1320 100644 --- a/config/servicewatchdog/servicewatchdog.xml +++ b/config/servicewatchdog/servicewatchdog.xml @@ -40,7 +40,7 @@ <requirements>None</requirements> <faq>Monitors for stopped services and restarts them.</faq> <name>Service Watchdog</name> - <version>1.2</version> + <version>1.3</version> <title>Services: Service Watchdog</title> <include_file>/usr/local/pkg/servicewatchdog.inc</include_file> <menu> diff --git a/config/servicewatchdog/servicewatchdog_cron.php b/config/servicewatchdog/servicewatchdog_cron.php index 5031ab0b..004afd97 100644 --- a/config/servicewatchdog/servicewatchdog_cron.php +++ b/config/servicewatchdog/servicewatchdog_cron.php @@ -1,6 +1,13 @@ #!/usr/local/bin/php -f <?php +require_once("globals.inc"); require_once("servicewatchdog.inc"); +global $g; + +/* Do nothing at bootup. */ +if ($g['booting'] || file_exists("{$g['varrun_path']}/booting")) + return; + servicewatchdog_check_services(); ?>
\ No newline at end of file diff --git a/pkg_config.8.xml b/pkg_config.8.xml index beb9fea2..6fbef650 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1954,7 +1954,7 @@ <name>Service Watchdog</name> <descr>Monitors for stopped services and restarts them.</descr> <maintainer>jimp@pfsense.org</maintainer> - <version>1.2</version> + <version>1.3</version> <category>Services</category> <status>BETA</status> <config_file>http://www.pfsense.com/packages/config/servicewatchdog/servicewatchdog.xml</config_file> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 86cb6d54..a11684d8 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1941,7 +1941,7 @@ <name>Service Watchdog</name> <descr>Monitors for stopped services and restarts them.</descr> <maintainer>jimp@pfsense.org</maintainer> - <version>1.2</version> + <version>1.3</version> <category>Services</category> <status>BETA</status> <config_file>http://www.pfsense.com/packages/config/servicewatchdog/servicewatchdog.xml</config_file> |