svn commit: r331728 - in stable/11/etc: . rc.d

[Marcelo Araujo]

On Thu, Mar 29, 2018, 9:20 PM Rodney W. Grimes <
freebsd at pdx.rh.cn85.dnsmgr.net> wrote:

> > Author: araujo
> > Date: Thu Mar 29 04:51:07 2018
> > New Revision: 331728
> > URL: https://svnweb.freebsd.org/changeset/base/331728
> >
> > Log:
> >   MFC r329817:
>
> I must of missed this when it landed in ^/head
>

No you didn't! But for every each commit you send a reply, so I did missed
it checking all the emails traffic.


> >   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 at dpdtech.com>
> >   Sponsored by:       iXsystems Inc.
> >   Differential Revision:      https://reviews.freebsd.org/D14286
>
> No one accepted it :-(.
>


I was the reviewer if you didn't notice!


> > Modified:
> >   stable/11/etc/rc.d/ipfw
> >   stable/11/etc/rc.firewall
> > Directory Properties:
> >   stable/11/   (props changed)
> >
> > Modified: stable/11/etc/rc.d/ipfw
> >
> ==============================================================================
> > --- stable/11/etc/rc.d/ipfw   Thu Mar 29 04:41:45 2018        (r331727)
> > +++ stable/11/etc/rc.d/ipfw   Thu Mar 29 04:51:07 2018        (r331728)
> > @@ -40,7 +40,11 @@ ipfw_start()
> >  {
> >       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
> >       [ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall
> >
> > Modified: stable/11/etc/rc.firewall
> >
> ==============================================================================
> > --- stable/11/etc/rc.firewall Thu Mar 29 04:41:45 2018        (r331727)
> > +++ stable/11/etc/rc.firewall Thu Mar 29 04:51:07 2018        (r331728)
> > @@ -112,12 +112,20 @@ setup_ipv6_mandatory() {
> >       ${fwcmd} add pass ipv6-icmp from any to any icmp6types 2,135,136
> >  }
> >
> > +. /etc/rc.subr
> > +. /etc/network.subr
> > +
> >  if [ -n "${1}" ]; then
> >       firewall_type="${1}"
> >  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
>
> firewall_rc_config_load is undocumented and missing from
> /etc/defaults/rc.conf.


If you have time, it is a good opportunity to send a patch, I can review
it, otherwise I will fix it this week or next.

Thanks.


> >
> > -. /etc/rc.subr
> > -. /etc/network.subr
> >  afexists inet6
> >  ipv6_available=$?
>
> --
> Rod Grimes
> rgrimes at freebsd.org
>