svn commit: r190575 - head/etc/rc.d
Maksim Yevmenkin
emax at FreeBSD.org
Mon Mar 30 14:31:54 PDT 2009
Author: emax
Date: Mon Mar 30 21:31:52 2009
New Revision: 190575
URL: http://svn.freebsd.org/changeset/base/190575
Log:
- Add ipfw_nat to the list of required modules if "firewall_nat_enable"
is set and "natd_enable" is NOT set;
- Accept and pass firewall type to the external firewall script.
Submitted by: Yuri Kurenkov < y -dot- kurenkov -at- init -dot- ru >
MFC after: 3 days
No response from: freebsd-rc
Modified:
head/etc/rc.d/ipfw
Modified: head/etc/rc.d/ipfw
==============================================================================
--- head/etc/rc.d/ipfw Mon Mar 30 21:29:25 2009 (r190574)
+++ head/etc/rc.d/ipfw Mon Mar 30 21:31:52 2009 (r190575)
@@ -23,10 +23,20 @@ ipfw_prestart()
if checkyesno dummynet_enable; then
required_modules="$required_modules dummynet"
fi
+
+ if checkyesno firewall_nat_enable; then
+ if ! checkyesno natd_enable; then
+ required_modules="$required_modules ipfw_nat"
+ fi
+ fi
}
ipfw_start()
{
+ local _firewall_type
+
+ _firewall_type=$1
+
# set the firewall rules script if none was specified
[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall
@@ -34,7 +44,7 @@ ipfw_start()
if [ -f /etc/rc.d/natd ] ; then
/etc/rc.d/natd quietstart
fi
- /bin/sh "${firewall_script}"
+ /bin/sh "${firewall_script}" "${_firewall_type}"
echo 'Firewall rules loaded.'
elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then
echo 'Warning: kernel has firewall functionality, but' \
@@ -67,4 +77,4 @@ ipfw_stop()
}
load_rc_config $name
-run_rc_command "$1"
+run_rc_command $*
More information about the svn-src-head
mailing list