From 24d5fc0aa332b86a81f520eeef6232bf5b5fe745 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 11 May 2010 10:45:59 -0400
Subject: [PATCH] Fix booting checks. Part of ticket #53.

---
 etc/rc.filter_synchronize | 5 +++--
 etc/rc.linkup             | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index c4d8960c0d..6e49ed3a78 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -80,7 +80,7 @@ function remove_special_characters($string) {
 function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsense.restore_config_section') {
         global $config, $g;
 
-        if($g['booting'])
+        if(file_exists("{$g['varrun_path']}/booting"))
                 return;
 
         update_filter_reload_status("Syncing CARP data to {$url}");
@@ -199,7 +199,8 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens
         }
 }
 
-if ($g['booting'])
+global $g;
+if (file_exists("{$g['varrun_path']}/booting"))
 	return;
 
 if (is_array($config['installedpackages']['carpsettings']['config'])) {
diff --git a/etc/rc.linkup b/etc/rc.linkup
index 5f4bf61dde..59c604e85d 100755
--- a/etc/rc.linkup
+++ b/etc/rc.linkup
@@ -63,7 +63,8 @@ function handle_argument_group($iface, $argument2) {
 	}
 }
 
-if ($g['booting'] == true) {
+global $g;
+if (file_exists("{$g['varrun_path']}/booting")) {
 	/* ignore all linkup events */
 } else {
 	foreach($_SERVER['argv'] as $argv) {