Merge pull request #1060 from doktornotor/patch-7

6 files changed, 35 insertions, 15 deletions

diff --git a/config/ipguard/ipguard.inc b/config/ipguard/ipguard.inc
index 53284c96..68e08e9f 100644
--- a/config/ipguard/ipguard.inc
+++ b/config/ipguard/ipguard.inc
@@ -41,7 +41,11 @@ function ipguard_custom_php_write_config() {
 	global $g, $config;
 
 	/* Detect boot process and do nothing */
-	if (platform_booting()) {
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}
 
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index e9656afd..2282d4e3 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -139,12 +139,14 @@ function sync_package_lcdproc_screens() {
 }
 
 function sync_package_lcdproc() {
-	global $g;
-	global $config;
-	global $input_errors;
+	global $g, $config, $input_errors;
 
 	# Detect boot process
-	if (platform_booting()) {
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}
 
diff --git a/config/nut/nut.inc b/config/nut/nut.inc
index 71b06932..a864b965 100644
--- a/config/nut/nut.inc
+++ b/config/nut/nut.inc
@@ -492,8 +492,7 @@ EOD;
 	}
 
 	function sync_package_nut() {
-		global $config;
-		global $input_errors;
+		global $g, $config, $input_errors;
 
 		stop_service("nut");
 
@@ -509,10 +508,12 @@ EOD;
 			$return = sync_package_nut_snmp();
 		}
 
-		if ((!platform_booting()) && (nut_config('monitor'))) {
-			/* only start if enabled and system is not booting */
-			/* this prevents service from starting / stopping / starting on boot */
-
+		/* only start if enabled and system is not booting */
+		/* this prevents service from starting / stopping / starting on boot */
+		if ((function_exists("platform_booting")) && (!platform_booting()) && (nut_config('monitor'))) {
+			log_error("[nut] INFO: Starting service");
+			start_service("nut");
+		} elseif ((!($g['booting'])) && (nut_config('monitor'))) {
 			log_error("[nut] INFO: Starting service");
 			start_service("nut");
 		} elseif (!$return && file_exists(NUT_RCFILE)) {
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc
index 446b5f82..85410560 100644
--- a/config/sarg/sarg.inc
+++ b/config/sarg/sarg.inc
@@ -192,7 +192,11 @@ function sync_package_sarg() {
 	global $config, $g, $sarg_proxy;
 
 	// detect boot process
-	if (platform_booting()) {
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}
 
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 27bff27b..5a0946bb 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -543,10 +543,15 @@ function squid_validate_auth($post, &$input_errors) {
 }
 
 function squid_install_cron($should_install) {
-	global $config;
-	if (platform_booting()) {
+	global $g, $config;
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}
+
 	parse_config(true);
 
 	if (is_array($config['installedpackages']['squidcache'])) {
diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc
index c7c19291..9c3a8bb9 100644
--- a/config/sshdcond/sshdcond.inc
+++ b/config/sshdcond/sshdcond.inc
@@ -62,7 +62,11 @@ function sshdcond_custom_php_write_config() {
 	global $g, $config, $pkg_interface;
 
 	/* Detect boot process, do nothing during boot. */
-	if (platform_booting()) {
+	if (function_exists("platform_booting")) {
+		if (platform_booting()) {
+			return;
+		}
+	} elseif ($g['booting']) {
 		return;
 	}