The firewall_type is ignored if not set in rc.conf or rc.conf.local,
after r190575 there is an option to call rc.firewall with the firewall_type passed in as an argument. Submitted by: David P. Discher <dpd@dpdtech.com> MFC after: 3 weeks. Sponsored by: iXsystems Inc. Differential Revision: https://reviews.freebsd.org/D14286
This commit is contained in:
parent
4d87e27125
commit
61e7e50da9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=329817
@ -40,7 +40,11 @@ ipfw_start()
|
|||||||
{
|
{
|
||||||
local _firewall_type
|
local _firewall_type
|
||||||
|
|
||||||
_firewall_type=$1
|
if [ -n "${1}" ]; then
|
||||||
|
_firewall_type=$1
|
||||||
|
else
|
||||||
|
_firewall_type=${firewall_type}
|
||||||
|
fi
|
||||||
|
|
||||||
# set the firewall rules script if none was specified
|
# set the firewall rules script if none was specified
|
||||||
[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall
|
[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall
|
||||||
|
@ -112,12 +112,20 @@ setup_ipv6_mandatory() {
|
|||||||
${fwcmd} add pass ipv6-icmp from any to any icmp6types 2,135,136
|
${fwcmd} add pass ipv6-icmp from any to any icmp6types 2,135,136
|
||||||
}
|
}
|
||||||
|
|
||||||
|
. /etc/rc.subr
|
||||||
|
. /etc/network.subr
|
||||||
|
|
||||||
if [ -n "${1}" ]; then
|
if [ -n "${1}" ]; then
|
||||||
firewall_type="${1}"
|
firewall_type="${1}"
|
||||||
fi
|
fi
|
||||||
|
if [ -z "${firewall_rc_config_load}" ]; then
|
||||||
|
load_rc_config ipfw
|
||||||
|
else
|
||||||
|
for i in ${firewall_rc_config_load}; do
|
||||||
|
load_rc_config $i
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
. /etc/rc.subr
|
|
||||||
. /etc/network.subr
|
|
||||||
afexists inet6
|
afexists inet6
|
||||||
ipv6_available=$?
|
ipv6_available=$?
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user