svn commit: r354060 - in stable/12: . sbin/ifconfig share/man/man4 sys/amd64/conf sys/arm/conf sys/arm64/conf sys/conf sys/i386/

[Kyle Evans]

On Thu, Oct 24, 2019 at 11:50 PM Helge Oldach <freebsd at oldach.net> wrote:
>
> Hi,
>
> Kyle Evans wrote on Fri, 25 Oct 2019 03:10:08 +0200 (CEST):
> > Author: kevans
> > Date: Fri Oct 25 01:10:08 2019
> > New Revision: 354060
> > URL: https://svnweb.freebsd.org/changeset/base/354060
> >
> > Log:
> >   MFC tun/tap merge: r347241, r347394, r347404, r347483, r351220, r351229,
> >   r352148, r353056-r353057, r353781-r353782, r353785-r353786, r353877
>
> > Modified: stable/12/UPDATING
> > ==============================================================================
> > --- stable/12/UPDATING        Fri Oct 25 00:47:37 2019        (r354059)
> > +++ stable/12/UPDATING        Fri Oct 25 01:10:08 2019        (r354060)
> > @@ -16,6 +16,14 @@ from older versions of FreeBSD, try WITHOUT_CLANG and
> >  the tip of head, and then rebuild without this option. The bootstrap process
> >  from older version of current across the gcc/clang cutover is a bit fragile.
> >
> > +20191024:
> > +     The tap(4) driver has been folded into tun(4), and the module has been
> > +     renamed to tuntap.  You should update any kld_load="if_tap" or
> > +     kld_load="if_tun" entries in /etc/rc.conf, if_tap_load="YES" or
> > +     if_tun_load="YES" entries in /boot/loader.conf to load the if_tuntap
> > +     module instead, and "device tap" or "device tun" entries in kernel
> > +     config files to select the tuntap device instead.
> > +
>
> Should the /etc/rc.conf reference read kld_list instead of kld_load?
>

Ah, but of course I would do it a second time. Fixed in r354066- thanks!