summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/network.subr4
-rw-r--r--etc/rc.d/netoptions4
-rw-r--r--etc/rc.d/network14
-rw-r--r--etc/rc.d/network24
-rw-r--r--etc/rc.d/network34
-rw-r--r--etc/rc.d/routing4
-rw-r--r--etc/rc.network4
7 files changed, 21 insertions, 7 deletions
diff --git a/etc/network.subr b/etc/network.subr
index 2146b90..59f5370 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -85,6 +85,7 @@ network_pass1() {
else
echo 'Warning: IP-filter module failed to load.'
# avoid further errors
+ ipfilter_active="NO"
ipmon_enable="NO"
ipfilter_enable="NO"
ipnat_enable="NO"
@@ -298,11 +299,12 @@ network_pass1() {
# Re-Sync ipfilter so it picks up any new network interfaces
#
- case ${ipfilter_enable} in
+ case ${ipfilter_active} in
[Yy][Ee][Ss])
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
;;
esac
+ unset ipfilter_active
# Initialize IP filtering using ipfw
#
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 2146b90..59f5370 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -85,6 +85,7 @@ network_pass1() {
else
echo 'Warning: IP-filter module failed to load.'
# avoid further errors
+ ipfilter_active="NO"
ipmon_enable="NO"
ipfilter_enable="NO"
ipnat_enable="NO"
@@ -298,11 +299,12 @@ network_pass1() {
# Re-Sync ipfilter so it picks up any new network interfaces
#
- case ${ipfilter_enable} in
+ case ${ipfilter_active} in
[Yy][Ee][Ss])
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
;;
esac
+ unset ipfilter_active
# Initialize IP filtering using ipfw
#
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 2146b90..59f5370 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -85,6 +85,7 @@ network_pass1() {
else
echo 'Warning: IP-filter module failed to load.'
# avoid further errors
+ ipfilter_active="NO"
ipmon_enable="NO"
ipfilter_enable="NO"
ipnat_enable="NO"
@@ -298,11 +299,12 @@ network_pass1() {
# Re-Sync ipfilter so it picks up any new network interfaces
#
- case ${ipfilter_enable} in
+ case ${ipfilter_active} in
[Yy][Ee][Ss])
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
;;
esac
+ unset ipfilter_active
# Initialize IP filtering using ipfw
#
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 2146b90..59f5370 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -85,6 +85,7 @@ network_pass1() {
else
echo 'Warning: IP-filter module failed to load.'
# avoid further errors
+ ipfilter_active="NO"
ipmon_enable="NO"
ipfilter_enable="NO"
ipnat_enable="NO"
@@ -298,11 +299,12 @@ network_pass1() {
# Re-Sync ipfilter so it picks up any new network interfaces
#
- case ${ipfilter_enable} in
+ case ${ipfilter_active} in
[Yy][Ee][Ss])
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
;;
esac
+ unset ipfilter_active
# Initialize IP filtering using ipfw
#
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 2146b90..59f5370 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -85,6 +85,7 @@ network_pass1() {
else
echo 'Warning: IP-filter module failed to load.'
# avoid further errors
+ ipfilter_active="NO"
ipmon_enable="NO"
ipfilter_enable="NO"
ipnat_enable="NO"
@@ -298,11 +299,12 @@ network_pass1() {
# Re-Sync ipfilter so it picks up any new network interfaces
#
- case ${ipfilter_enable} in
+ case ${ipfilter_active} in
[Yy][Ee][Ss])
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
;;
esac
+ unset ipfilter_active
# Initialize IP filtering using ipfw
#
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 2146b90..59f5370 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -85,6 +85,7 @@ network_pass1() {
else
echo 'Warning: IP-filter module failed to load.'
# avoid further errors
+ ipfilter_active="NO"
ipmon_enable="NO"
ipfilter_enable="NO"
ipnat_enable="NO"
@@ -298,11 +299,12 @@ network_pass1() {
# Re-Sync ipfilter so it picks up any new network interfaces
#
- case ${ipfilter_enable} in
+ case ${ipfilter_active} in
[Yy][Ee][Ss])
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
;;
esac
+ unset ipfilter_active
# Initialize IP filtering using ipfw
#
diff --git a/etc/rc.network b/etc/rc.network
index 2146b90..59f5370 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -85,6 +85,7 @@ network_pass1() {
else
echo 'Warning: IP-filter module failed to load.'
# avoid further errors
+ ipfilter_active="NO"
ipmon_enable="NO"
ipfilter_enable="NO"
ipnat_enable="NO"
@@ -298,11 +299,12 @@ network_pass1() {
# Re-Sync ipfilter so it picks up any new network interfaces
#
- case ${ipfilter_enable} in
+ case ${ipfilter_active} in
[Yy][Ee][Ss])
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
;;
esac
+ unset ipfilter_active
# Initialize IP filtering using ipfw
#
OpenPOWER on IntegriCloud