Do not call filer_configure() if booting. set /tmp/filter_boot_dirty flag.

This commit is contained in:
Scott Ullrich 2005-07-03 22:37:45 +00:00
parent 94fa383863
commit e239df5a60
3 changed files with 10 additions and 9 deletions

View File

@ -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();

View File

@ -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;

View File

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