From owner-svn-src-head@freebsd.org Fri Mar 10 18:13:52 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CCE3D06526 for ; Fri, 10 Mar 2017 18:13:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 32387FB6 for ; Fri, 10 Mar 2017 18:13:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x242.google.com with SMTP id n76so7682403ioe.1 for ; Fri, 10 Mar 2017 10:13:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=LN22rXIYzDMhYRAl4rvlcEbF5lc6M9xW/LX6QKuBs5U=; b=fP0xi5emMOaxjZQSyRLxIIUwiiuD8m+S9/9Y38S6MAqG1OAtr87S67GsCQr4OeqyUX We28WkI18Lj4lTaTgIn9De0iMlEDMpQS2LzCFF6vNfj3LVxaZ/lo9F91wLtrrsP3uRUl qOYqsijLF0pvceCLnZOaOg/tLDkrNTRLM3VqSN+5I3TDe+wH4hzdfpKgNPwOai35G49V CMDaOP0R0wO2F3n/gYr1IIktNy2H8AQMuWFDuCj42rrSQ64FGJNlXCZ9LZNCrmeiQAXC VFks8RaaIbn3zv/vJSSTsUzuSTJAcg5+HAF99P+OS16CHgeMk+rkfJh7wnRbipv0vd9O ZLoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=LN22rXIYzDMhYRAl4rvlcEbF5lc6M9xW/LX6QKuBs5U=; b=D2Bz0gqr1tHskjyMsL5EYppM2NcfJAU7DVrb+VC0hEliAYk2BrKYfzqX+cuqJ/Wm6D Z23VkgkQluv2nTznPlg08ZhJZvgpUOUyZFWK6oJCnrZd/cM2y3Fa3fUdpdZvfARiKo1Q gDDjrl2Uj3DBH2ZBSiY13svi5rDKfdTUI+9OJD3RslK3a/Uqz1Hgi++qM083gXXpS91m vtFJexkZDqzOPbF9uyTfKLWglrqIB9Ks/43CXR3J9zgppQXLVChAcHCaFW7Ipz7un1Ha QXsUo74QAm0ucFQsNUfy2wrnQZWkU6z8nucA9yBhe0Aftxw50oQorqUS6HW7PL5fJZFJ wtgg== X-Gm-Message-State: AMke39lQP2p+d0rFT/WrLmtsxHIc7wbcJ2lXQX5OPiDsiBd1/b+r8xgvrhMHIH8/A69GaZBVorYfIzDNZDIMYg== X-Received: by 10.107.134.94 with SMTP id i91mr17456679iod.0.1489169630953; Fri, 10 Mar 2017 10:13:50 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.134.129 with HTTP; Fri, 10 Mar 2017 10:13:50 -0800 (PST) X-Originating-IP: [69.53.245.200] In-Reply-To: References: <201701100323.v0A3NMAI045868@repo.freebsd.org> <20170215100637.2xsyyu46odzig4c4@dhcp-3-221.uk.xensource.com> From: Warner Losh Date: Fri, 10 Mar 2017 11:13:50 -0700 X-Google-Sender-Auth: ZnHD-KYz_BVClGknCkvMNk_i9kY Message-ID: Subject: Re: svn commit: r311849 - in head: . sys/amd64/conf sys/arm64/conf sys/conf sys/dev/e1000 sys/i386/conf sys/mips/conf sys/modules sys/modules/em sys/modules/igb sys/powerpc/conf To: Sean Bruno Cc: =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Mar 2017 18:13:52 -0000 On Fri, Mar 10, 2017 at 11:06 AM, Sean Bruno wrote: > > > On 02/15/17 03:06, Roger Pau Monn=C3=A9 wrote: >> On Tue, Jan 10, 2017 at 03:23:22AM +0000, Sean Bruno wrote: >>> Author: sbruno >>> Date: Tue Jan 10 03:23:22 2017 >>> New Revision: 311849 >>> URL: https://svnweb.freebsd.org/changeset/base/311849 >>> >>> Log: >>> Migrate e1000 to the IFLIB framework: >>> - em(4) igb(4) and lem(4) >>> - deprecate the igb device from kernel configurations >>> - create a symbolic link in /boot/kernel from if_em.ko to if_igb.ko >> >> This linking causes mfsBSD to choke when building an image from HEAD. It= tries >> to issue the following command: >> >> ${_v}${CP} -rp ${_BOOTDIR}/kernel ${WRKDIR}/disk/boot >> >> Which fails when finding the symbol link. I can send a patch to change t= hat to >> -Rp, which would work fine, but wouldn't it be better to either complete= ly >> remove if_igb.ko, or simply copy if_em.ko to if_igb.ko? >> >> I'm wondering if for example anyone strips down it's /boot/kernel/ manua= lly, by >> removing unused modules, and what would happen if if_em.ko is removed bu= t not >> if_igb.ko. >> >> Roger. >> >> > > Well, this was my naive attempt to make upgrades for users to be > non-eventful in the event they have "if_igb_load=3DYES" in their > loader.conf instead of having it built into their kernel. > > If the -Rp works, I'll add that instead. The module name is encoded in the module itself. The boot loader looks it up to see which module to load. Maybe there's a way to fix it so both load from one file? Warner