Fix booting checks. Part of ticket #53.

This commit is contained in:
jim-p 2010-05-11 10:45:59 -04:00
parent 246aceaaf5
commit 24d5fc0aa3
2 changed files with 5 additions and 3 deletions

View File

@ -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'])) {

View File

@ -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) {