From owner-freebsd-stable@FreeBSD.ORG Fri Feb 25 13:35:06 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 B4FF01065674 for ; Fri, 25 Feb 2011 13:35:06 +0000 (UTC) (envelope-from freebsd-stable@m.gmane.org) Received: from lo.gmane.org (lo.gmane.org [80.91.229.12]) by mx1.freebsd.org (Postfix) with ESMTP id 360778FC15 for ; Fri, 25 Feb 2011 13:35:06 +0000 (UTC) Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Psxp1-0006eJ-Or for freebsd-stable@freebsd.org; Fri, 25 Feb 2011 14:35:03 +0100 Received: from c-82-209-158-57.cust.bredband2.com ([82.209.158.57]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 25 Feb 2011 14:35:03 +0100 Received: from mc by c-82-209-158-57.cust.bredband2.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 25 Feb 2011 14:35:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: freebsd-stable@freebsd.org From: Michael Cardell Widerkrantz Date: Fri, 25 Feb 2011 11:56:46 +0100 Organization: Temple of the Moby Hack Lines: 52 Message-ID: <86zkpkwff5.fsf@brain.hack.org> References: <4D66CCFF.9020903@buffalo.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: c-82-209-158-57.cust.bredband2.com User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) Cancel-Lock: sha1:32QmoRPn90DnUKSWfZTRr/eMTS0= 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 13:35:06 -0000 Ken Smith, 2011-02-24 22:26 (+0100): > Just a quick note for those of you who are not subscribed to the > freebsd-announce mail list... > > 8.2-RELEASE and 7.4-RELEASE have been announced. The announcement > messages are available here: > > http://www.freebsd.org/releases/8.2R/announce.html > http://www.freebsd.org/releases/7.4R/announce.html > > Enjoy. :-) Great news. However, a freebsd-update from a straight binary installed 8.1-RELEASE gives me a dialogue to merge a lot of files in /etc/ with just the $Id$ tag being different. That is, I get: The following changes, which occurred between FreeBSD 8.1-RELEASE and FreeBSD 8.2-RELEASE have been merged into /etc/manpath.config: --- current version +++ new version @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.26.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $ +# $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.26.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $ # # This file is read by manpath(1) to configure the mandatory manpath, # optional manpath and to map each path element to a manpath element. # The format is: # Does this look reasonable (y/n)? I'm afraid this will go on for all files in /etc. What just happened? How can I avoid it? I had this problem before and then in my frustration just commented out this line in freebsd-update.conf: #MergeChanges /etc/ /var/named/etc/ /boot/device.hints I got lucky that time, but is this really safe? What if, say, a new daemon has been installed in the upgrade and needs a new user. Any suggestions? -- http://hack.org/mc/ Use plain text e-mail, please. OpenPGP welcome, 0xE4C92FA5.