From owner-cvs-all@FreeBSD.ORG Fri Mar 26 22:36:42 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3160A16A4CE; Fri, 26 Mar 2004 22:36:42 -0800 (PST) Received: from TRANG.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 122CF43D31; Fri, 26 Mar 2004 22:36:42 -0800 (PST) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by TRANG.nuxi.com (8.12.11/8.12.10) with ESMTP id i2R6aftE085142; Fri, 26 Mar 2004 22:36:41 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.11/8.12.11/Submit) id i2R6af7U085141; Fri, 26 Mar 2004 22:36:41 -0800 (PST) (envelope-from obrien) Date: Fri, 26 Mar 2004 22:36:41 -0800 From: "David O'Brien" To: Scott Long Message-ID: <20040327063641.GA85117@dragon.nuxi.com> References: <200403261846.i2QIkVuT063179@repoman.freebsd.org> <200403261706.46836.jhb@FreeBSD.org> <20040326223518.GA78950@dragon.nuxi.com> <4064ED3E.4000407@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4064ED3E.4000407@freebsd.org> User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 5.2-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org cc: John Baldwin Subject: Re: cvs commit: src/sys/boot/i386/boot0 boot0ext.s src/sys/boot/i386/boot0ext Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@freebsd.org List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2004 06:36:42 -0000 On Fri, Mar 26, 2004 at 07:55:58PM -0700, Scott Long wrote: > >>> Added files: > >>> sys/boot/i386/boot0 boot0ext.s > >>> sys/boot/i386/boot0ext Makefile > >>> Log: > >>> Bring back jhb's two sector (1024 bytes) 'boot0' [rev 1.22] as > >>>'boot0ext'. > >> > >>This has a bug that I've fixed in a p4 branch. You could have found that > >>out if you had asked me first. > > > >I plan to commit what you have from p4. But I wanted this to be an > >exact copy of rev 1.22, so that if we can agree to go with the 2-sector > >boot0 for 6.0, it would be easier to see the changes. > > > >Please feel free to commit what you have in perforce, since it will be a > >little bit until I can. > > Since you seem to be concerned about preserving history, could bringing > this file back have been done as a repo-copy? Not as you might expect. I expect for 6.0, that 'boot0.s' will be the 2-sector one. Thus there will a diversion fork, I can't think of a way around it. But I'm trying to make it as easy to follow as possible. -- -- David (obrien@FreeBSD.org)