diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-07-10 02:39:22 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-07-10 02:39:22 +0000 |
| commit | f229e20fb3b1edf251a3a7350691b50279d1c930 (patch) | |
| tree | d817ef85c69d7f7e3ae96725e147c674c1253273 | |
| parent | a372447e393de11f9af24b38243a843f64e8676a (diff) | |
| download | pfsense-f229e20fb3b1edf251a3a7350691b50279d1c930.zip pfsense-f229e20fb3b1edf251a3a7350691b50279d1c930.tar.gz | |
filter_boot_dirty -> filter_dirty
| -rw-r--r-- | etc/inc/interfaces.inc | 6 | ||||
| -rw-r--r-- | etc/inc/services.inc | 2 | ||||
| -rwxr-xr-x | etc/rc | 7 |
3 files changed, 4 insertions, 11 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 1049208..8d760df 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -118,7 +118,7 @@ function interfaces_lan_configure() { system_routing_configure(); /* set the reload filter dity flag */ - touch("{$g['tmp_path']}/filter_boot_dirty"); + touch("{$g['tmp_path']}/filter_dirty"); /* reload IPsec tunnels */ vpn_ipsec_configure(); @@ -155,7 +155,7 @@ function interfaces_optional_configure() { system_routing_configure(); /* set the reload filter dity flag */ - touch("{$g['tmp_path']}/filter_boot_dirty"); + touch("{$g['tmp_path']}/filter_dirty"); /* reload IPsec tunnels */ vpn_ipsec_configure(); @@ -478,7 +478,7 @@ function interfaces_wan_configure() { system_routing_configure(); /* set the reload filter dity flag */ - touch("{$g['tmp_path']}/filter_boot_dirty"); + touch("{$g['tmp_path']}/filter_dirty"); /* reload ipsec tunnels */ vpn_ipsec_configure(); diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 6c0377a..c6dd95a 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -268,7 +268,7 @@ function services_dhcrelay_configure() { if (!$g['booting']) { /* set the reload filter dity flag */ - touch("{$g['tmp_path']}/filter_boot_dirty"); + touch("{$g['tmp_path']}/filter_dirty"); } return 0; @@ -159,13 +159,6 @@ if [ ! "$PLATFORM" = "cdrom" ]; then done fi -if [ -f /tmp/filter_boot_dirty ]; then - # one more pass to give package plugins a chance to adjust - echo -n "Final firewall setup in progress..." - /etc/rc.filter_configure - echo "Done." -fi - rm -rf /usr/local/pkg/pf/CVS /usr/local/bin/php -f /etc/rc.conf_mount_ro |
