diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-07-03 22:37:45 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-07-03 22:37:45 +0000 |
| commit | e239df5a60b5a492c79c8342df6911a0c299b50c (patch) | |
| tree | 1d371216bcd1da403bd31d75be59b0b45385b93c | |
| parent | 94fa383863c206f3a0995af87151ead27cfef467 (diff) | |
| download | pfsense-e239df5a60b5a492c79c8342df6911a0c299b50c.zip pfsense-e239df5a60b5a492c79c8342df6911a0c299b50c.tar.gz | |
Do not call filer_configure() if booting. set /tmp/filter_boot_dirty flag.
| -rw-r--r-- | etc/inc/interfaces.inc | 12 | ||||
| -rw-r--r-- | etc/inc/services.inc | 3 | ||||
| -rw-r--r-- | etc/inc/vpn.inc | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 2552d18..3d5b6d9 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -119,8 +119,8 @@ function interfaces_lan_configure() { /* reconfigure static routes (kernel may have deleted them) */ system_routing_configure(); - /* reload ipfilter (address may have changed) */ - filter_configure(); + /* set the reload filter dity flag */ + touch("{$g['tmp_path']}/filter_boot_dirty"); /* reload IPsec tunnels */ vpn_ipsec_configure(); @@ -156,8 +156,8 @@ function interfaces_optional_configure() { /* reconfigure static routes (kernel may have deleted them) */ system_routing_configure(); - /* reload ipfilter (address may have changed) */ - filter_configure(); + /* set the reload filter dity flag */ + touch("{$g['tmp_path']}/filter_boot_dirty"); /* reload IPsec tunnels */ vpn_ipsec_configure(); @@ -466,8 +466,8 @@ function interfaces_wan_configure() { /* reconfigure static routes (kernel may have deleted them) */ system_routing_configure(); - /* reload ipfilter */ - filter_configure(); + /* set the reload filter dity flag */ + touch("{$g['tmp_path']}/filter_boot_dirty"); /* reload ipsec tunnels */ vpn_ipsec_configure(); diff --git a/etc/inc/services.inc b/etc/inc/services.inc index ef4b21e..0dc5b2e 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -267,7 +267,8 @@ function services_dhcrelay_configure() { mwexec($cmd); if (!$g['booting']) { - filter_configure(); + /* set the reload filter dity flag */ + touch("{$g['tmp_path']}/filter_boot_dirty"); } return 0; diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index e3a42a6..296f431 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -699,8 +699,8 @@ EOD; } if (!$g['booting']) { - /* reload the filter */ - filter_configure(); + /* set the reload filter dity flag */ + touch("{$g['tmp_path']}/filter_boot_dirty"); } if ($g['booting']) |
