diff options
| author | jim-p <jimp@pfsense.org> | 2010-05-11 10:45:59 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-05-11 11:05:33 -0400 |
| commit | 24d5fc0aa332b86a81f520eeef6232bf5b5fe745 (patch) | |
| tree | 10357b4c9e3bfb003f5b1c4cbf928d3c49d14708 /etc | |
| parent | 246aceaaf518d6ccb7a74354bf46e364539be195 (diff) | |
| download | pfsense-24d5fc0aa332b86a81f520eeef6232bf5b5fe745.zip pfsense-24d5fc0aa332b86a81f520eeef6232bf5b5fe745.tar.gz | |
Fix booting checks. Part of ticket #53.
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.filter_synchronize | 5 | ||||
| -rwxr-xr-x | etc/rc.linkup | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index c4d8960..6e49ed3 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 5f4bf61..59c604e 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) { |
