diff options
| author | Ermal <eri@pfsense.org> | 2010-12-06 10:12:49 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-12-06 10:12:49 +0000 |
| commit | 757c1bcc778c27bf9f92656d55bf01a1ecedd489 (patch) | |
| tree | bbc022625b46b8ad8143dd1068da7df9fa86e7ca /etc/inc | |
| parent | 847cd48d7d0eeb5242702901d042347fc1902012 (diff) | |
| download | pfsense-757c1bcc778c27bf9f92656d55bf01a1ecedd489.zip pfsense-757c1bcc778c27bf9f92656d55bf01a1ecedd489.tar.gz | |
Make sure filter_configure() is not called during bootup since its harmful.
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/filter.inc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index ec3c110..421df12 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -131,11 +131,19 @@ function filter_pflog_start() { /* reload filter async */ function filter_configure() { + global $g; + if(isset($config['system']['developerspew'])) { $mt = microtime(); echo "filter_configure() being called $mt\n"; } - send_event("filter reload"); + + /* + * NOTE: Check here for bootup status since this should not be triggered during bootup. + * The reason is that rc.bootup calls filter_configure_sync directly which does this too. + */ + if (!$g['booting']) + send_event("filter reload"); } function filter_delete_states_for_down_gateways() { |
