From owner-svn-src-stable-12@freebsd.org Fri Oct 25 12:46:53 2019 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 22794170578; Fri, 25 Oct 2019 12:46:53 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4703ld03F5z4TLZ; Fri, 25 Oct 2019 12:46:53 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id CB977138BA; Fri, 25 Oct 2019 12:46:52 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f179.google.com with SMTP id e14so3047465qto.1; Fri, 25 Oct 2019 05:46:52 -0700 (PDT) X-Gm-Message-State: APjAAAU4+nMhR07vW/oDkm+Iwpbth0OzUKzH0O0cNY3M2I27hVIomhOn HqhG1rUJP+yObNVjkdtGK07d/nJrj0l95lAMxxM= X-Google-Smtp-Source: APXvYqyvu2y0UuSP0kf522l6qPSgV3NSy7O0EdwQjHmr2RU2L4T4aXHrir+1edtlI73FK0jecxYxw/oUBvQqnxcBdYM= X-Received: by 2002:ac8:411b:: with SMTP id q27mr2879059qtl.53.1572007612175; Fri, 25 Oct 2019 05:46:52 -0700 (PDT) MIME-Version: 1.0 References: <201910250110.x9P1A8bl014107@repo.freebsd.org> <201910250450.x9P4oX9Q078873@nuc.oldach.net> In-Reply-To: <201910250450.x9P4oX9Q078873@nuc.oldach.net> From: Kyle Evans Date: Fri, 25 Oct 2019 07:46:39 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r354060 - in stable/12: . sbin/ifconfig share/man/man4 sys/amd64/conf sys/arm/conf sys/arm64/conf sys/conf sys/i386/ To: Helge Oldach Cc: src-committers , svn-src-all , svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Oct 2019 12:46:53 -0000 On Thu, Oct 24, 2019 at 11:50 PM Helge Oldach 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!