Date: Mon, 27 Dec 2010 22:20:28 -0800 From: Jason Helfman <jhelfman@e-e.com> To: Doug Barton <dougb@FreeBSD.org> Cc: freebsd-stable@freebsd.org Subject: Re: Accidentally aborted upgrade via freebsd-update - how to recover? Message-ID: <20101228062028.GA95888@eggman.experts-exchange.com> In-Reply-To: <4D1934B3.8080102@FreeBSD.org> References: <20101227224426.GA11955@lava.net> <20101227224752.GC1505@eggman.experts-exchange.com> <20101227225828.GB11955@lava.net> <4D1931FA.3070403@my.gd> <4D1934B3.8080102@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Dec 27, 2010 at 04:52:03PM -0800, Doug Barton thus spake: >On 12/27/2010 16:40, Damien Fleuriot wrote: >> >> >> On 12/27/10 11:58 PM, Clifton Royston wrote: >>> >>> OK, and oh well... I wish there were some way to automate the diffing >>> out of the $FreeBSD lines. I suppose those might be the artifact of >>> some previous upgrade, so that the file version present is not the one >>> expected for FreeBSD 6.1. >>> >>> -- Clifton >>> >> >> >> Wait, do you mean like, mergemaster -F ? >> >> Excerpt from the manual: >> -F If the files differ only by VCS Id ($FreeBSD) install >> the new file. >> >> >> I've discovered this rather recently, it's a *lifesaver* >> >> This comes from fbsd7's version though, I can not say for the one you're >> still running on fbsd6 > >You always want to run mergemaster from the version you are upgrading >_to_. It doesn't happen often (by design) but occasionally mergemaster >has to grow "special knowledge" of specific files/directories/etc. in a >new FreeBSD version. As far as I can tell, freebsd-update doesn't use mergemaster. /usr/src/usr.sbin/freebsd-update/freebsd-update.sh Source installation does, however I don't believe a binary upgrade does. -jgh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101228062028.GA95888>