Date: Fri, 26 Mar 2004 22:36:41 -0800 From: "David O'Brien" <obrien@freebsd.org> To: Scott Long <scottl@freebsd.org> Cc: John Baldwin <jhb@freebsd.org> Subject: Re: cvs commit: src/sys/boot/i386/boot0 boot0ext.s src/sys/boot/i386/boot0ext Makefile Message-ID: <20040327063641.GA85117@dragon.nuxi.com> In-Reply-To: <4064ED3E.4000407@freebsd.org> References: <200403261846.i2QIkVuT063179@repoman.freebsd.org> <200403261706.46836.jhb@FreeBSD.org> <20040326223518.GA78950@dragon.nuxi.com> <4064ED3E.4000407@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040327063641.GA85117>