Date: Fri, 25 Feb 2011 08:41:14 -1000 From: Clifton Royston <cliftonr@lava.net> To: jhelfman@e-e.com Cc: freebsd-stable@freebsd.org Subject: Re: 8.2/7.4-RELEASEs Announced... Message-ID: <20110225184114.GA33134@lava.net> In-Reply-To: <20110225180019.GD76063@eggman.experts-exchange.com> References: <4D66CCFF.9020903@buffalo.edu> <86zkpkwff5.fsf@brain.hack.org> <20110225134225.GB19190@tolstoy.tols.org> <20110225160109.GA32260@lava.net> <20110225180019.GD76063@eggman.experts-exchange.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Feb 25, 2011 at 10:00:19AM -0800, jhelfman@e-e.com wrote: > > On Fri, Feb 25, 2011 at 02:42:25PM +0100, Marco van Tol wrote: > >> > >> Read up on the mergemaster manual for options "-F" and "-i" :-) > > > > freebsd-update does not use mergemaster, though probably it should. > > My understanding is that freebsd-update was introduced prior to releases > being branched, so this issue surfaced at that time. The patch I believe > would be a fix to the freebsd-update client to better handle the tag. I > can't see mergemaster as being an easier solution, as the actual binary > would need to be verified against a known good index that would exist on the > update server. > > But then, again, I may be wrong. You may well be right; I haven't investigated how the two calculate the differences. > > We had this discussion a month or two ago. > > Do you have a link to this thread? Thread title is: "Accidentally aborted upgrade via freebsd-update - how to recover?" Relevant discussion starts here, on Dec 27 2010: <http://lists.freebsd.org/pipermail/freebsd-stable/2010-December/060763.html>; -- Clifton -- Clifton Royston -- cliftonr@iandicomputing.com / cliftonr@lava.net President - I and I Computing * http://www.iandicomputing.com/ Custom programming, network design, systems and network consulting services
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110225184114.GA33134>