From e3ffcea32677a506ecf142e427845ecae7451497 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 28 Aug 2013 16:22:03 -0400
Subject: Don't try to (re)start services during boot.

---
 config/servicewatchdog/servicewatchdog.xml      | 2 +-
 config/servicewatchdog/servicewatchdog_cron.php | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'config')

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
-- 
cgit v1.2.3