From owner-freebsd-stable@FreeBSD.ORG Fri Feb 25 18:41:17 2011 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C601C1065675 for ; Fri, 25 Feb 2011 18:41:17 +0000 (UTC) (envelope-from cliftonr@oz.volcano.org) Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.122]) by mx1.freebsd.org (Postfix) with ESMTP id 8316C8FC08 for ; Fri, 25 Feb 2011 18:41:17 +0000 (UTC) X-Authority-Analysis: v=1.1 cv=+c36koQ5Dcj/1qolKHjtkYAGXvrVJRRiKMp+84F5sLg= c=1 sm=0 a=DleubWtG9Z4A:10 a=kj9zAlcOel0A:10 a=G5OLwwqwWgs+1dCEPNHTSw==:17 a=ddqU6GQIAAAA:8 a=6I5d2MoRAAAA:8 a=jb__rZ8GAAAA:8 a=H9iEQFZ8AAAA:8 a=UdidQipT8TCuzZUsb14A:9 a=xKG1cGjqDL2G0SPXSrKj3NW_we0A:4 a=CjuIK1q_8ugA:10 a=U6pgVs7bZFwA:10 a=wLODFksJ6qEA:10 a=sHp_62vNEjwA:10 a=fZFZujrNNEQA:10 a=G5OLwwqwWgs+1dCEPNHTSw==:117 X-Cloudmark-Score: 0 X-Originating-IP: 75.80.196.236 Received: from [75.80.196.236] ([75.80.196.236:42988] helo=oz.volcano.org) by hrndva-oedge03.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id 88/4D-24070-BC7F76D4; Fri, 25 Feb 2011 18:41:16 +0000 Received: by oz.volcano.org (Postfix, from userid 1001) id 6946050824; Fri, 25 Feb 2011 08:41:14 -1000 (HST) Date: Fri, 25 Feb 2011 08:41:14 -1000 From: Clifton Royston To: jhelfman@e-e.com Message-ID: <20110225184114.GA33134@lava.net> Mail-Followup-To: jhelfman@e-e.com, freebsd-stable@freebsd.org 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> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110225180019.GD76063@eggman.experts-exchange.com> User-Agent: Mutt/1.4.2.3i Cc: freebsd-stable@freebsd.org Subject: Re: 8.2/7.4-RELEASEs Announced... X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 18:41:17 -0000 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: -- 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