From owner-cvs-src@FreeBSD.ORG Thu Jul 8 16:54:34 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA33A16A4CE; Thu, 8 Jul 2004 16:54:34 +0000 (GMT) Received: from gw.Awfulhak.org (awfulhak.demon.co.uk [80.177.173.150]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF7F843D1D; Thu, 8 Jul 2004 16:54:27 +0000 (GMT) (envelope-from brian@Awfulhak.org) Received: from mail.lan.Awfulhak.org (brian@dev.lan.Awfulhak.org [172.16.0.5]) by gw.Awfulhak.org (8.12.11/8.12.11) with SMTP id i68GrFHh001177; Thu, 8 Jul 2004 17:53:15 +0100 (BST) (envelope-from brian@Awfulhak.org) Date: Thu, 8 Jul 2004 17:53:15 +0100 From: Brian Somers Message-Id: <20040708175315.60f4577a@dev.lan.Awfulhak.org> In-Reply-To: <200407081340.i68DeX0j013960@repoman.freebsd.org> References: <200407081340.i68DeX0j013960@repoman.freebsd.org> X-Mailer: Sylpheed-Claws 0.9.12 (GTK+ 1.2.10; i386-portbld-freebsd5.2) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, hits=1.0 required=5.0 tests=SUBJ_HAS_SPACES autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on gw.lan.Awfulhak.org cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/alpha/alpha autoconf.c src/sys/amd64/amd64 autoconf.c src/sys/boot/common dev_net.c loader.8 src/sys/boot/forth loader.conf src/sys/conf NOTES files options src/sys/i386/i386 autoconf.c locore.s src/sys/ia64/ia64 autoconf.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jul 2004 16:54:35 -0000 On Thu, 8 Jul 2004 13:40:33 +0000 (UTC), Brian Somers wrote: > brian 2004-07-08 13:40:33 UTC > > FreeBSD src repository > > Modified files: > sys/alpha/alpha autoconf.c > sys/amd64/amd64 autoconf.c > sys/boot/common dev_net.c loader.8 > sys/boot/forth loader.conf > sys/conf NOTES files options > sys/i386/i386 autoconf.c locore.s > sys/ia64/ia64 autoconf.c > sys/modules/nfs4client Makefile > sys/modules/nfsclient Makefile > sys/netinet ip_input.c > sys/nfs4client nfs4_vfsops.c > sys/nfsclient bootp_subr.c nfs_vfsops.c > Log: > Change the following kernel options to environment variables: > > BOOTP -> bootp > BOOTP_NFSROOT -> bootp.nfsroot > BOOTP_NFSV3 -> bootp.nfsv3 > BOOTP_COMPAT -> bootp.compat > BOOTP_WIRED_TO -> bootp.wired_to > > This lets you PXE boot with a GENERIC kernel by putting this sort of thing > in loader.conf: > > bootp="YES" > bootp.nfsroot="YES" > bootp.nfsv3="YES" > bootp.wired_to="bge1" > > or even setting the variables manually from the OK prompt. > > Revision Changes Path > 1.58 +6 -6 src/sys/alpha/alpha/autoconf.c > 1.179 +11 -8 src/sys/amd64/amd64/autoconf.c > 1.14 +1 -1 src/sys/boot/common/dev_net.c > 1.63 +23 -0 src/sys/boot/common/loader.8 > 1.81 +5 -0 src/sys/boot/forth/loader.conf > 1.1242 +1 -8 src/sys/conf/NOTES > 1.924 +2 -2 src/sys/conf/files > 1.461 +0 -5 src/sys/conf/options > 1.176 +11 -8 src/sys/i386/i386/autoconf.c > 1.183 +0 -3 src/sys/i386/i386/locore.s > 1.18 +10 -13 src/sys/ia64/ia64/autoconf.c > 1.2 +1 -1 src/sys/modules/nfs4client/Makefile > 1.28 +1 -1 src/sys/modules/nfsclient/Makefile > 1.276 +6 -5 src/sys/netinet/ip_input.c > 1.8 +0 -1 src/sys/nfs4client/nfs4_vfsops.c > 1.59 +80 -76 src/sys/nfsclient/bootp_subr.c > 1.154 +11 -5 src/sys/nfsclient/nfs_vfsops.c Hmm, so as dwmalone@ has pointed out, this stuff just works even without any of the bootp stuff when you PXE boot. Thinking out loud, I now suspect that the only reason it was really necessary to have BOOTP_* configured into a kernel before this commit is if you don't have pxeboot(8) or loader(8). Is there anybody out there that uses the BOOTP* options that can confirm this ? Do I need to back out this commit ? -- Brian Don't _EVER_ lose your sense of humour !