aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-08-28 16:22:03 -0400
committerjim-p <jimp@pfsense.org>2013-08-28 16:22:03 -0400
commite3ffcea32677a506ecf142e427845ecae7451497 (patch)
tree45fecada99f14f8f84340fd16e59e7f097ef1e77 /config
parent429adb3b2dc66541670245bb63e0b952fda0617b (diff)
downloadpfsense-packages-e3ffcea32677a506ecf142e427845ecae7451497.tar.gz
pfsense-packages-e3ffcea32677a506ecf142e427845ecae7451497.tar.bz2
pfsense-packages-e3ffcea32677a506ecf142e427845ecae7451497.zip
Don't try to (re)start services during boot.
Diffstat (limited to 'config')
-rw-r--r--config/servicewatchdog/servicewatchdog.xml2
-rw-r--r--config/servicewatchdog/servicewatchdog_cron.php7
2 files changed, 8 insertions, 1 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