d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the test used to determine whether IPFilter is loaded or not

Browse Source 
into its own function to avoid a small duplication of code.
This commit is contained in:
Maxime Henrion 2004-01-24 20:40:11 +00:00
parent 92ba581c32
commit 226b72f862
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/rc.d/ipfilter
View File

@ -27,10 +27,19 @@ status_precmd="$stop_precmd"
status_cmd="ipfilter_status"
extra_commands="reload resync status"
ipfilter_loaded()
{
if ! kldstat -v | grep "IP Filter" > /dev/null 2>&1; then
return 1
else
return 0
fi
}
ipfilter_prestart()
{
# load ipfilter kernel module if needed
if ! kldstat -v | grep "IP Filter" > /dev/null 2>&1; then
if ! ipfilter_loaded; then
if kldload ipl; then
info 'IP-filter module loaded.'
else
@ -97,7 +106,7 @@ ipfilter_reload()
ipfilter_resync()
{
# Don't resync if ipfilter is not loaded
if ! kldstat -v | grep "IP Filter" > /dev/null 2>&1; then
if ! ipfilter_loaded; then
return
fi
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags}