Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Feb 2011 11:56:46 +0100
From:      Michael Cardell Widerkrantz <mc@hack.org>
To:        freebsd-stable@freebsd.org
Subject:   Re: 8.2/7.4-RELEASEs Announced...
Message-ID:  <86zkpkwff5.fsf@brain.hack.org>
References:  <4D66CCFF.9020903@buffalo.edu>

next in thread | previous in thread | raw e-mail | index | archive | help
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.




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86zkpkwff5.fsf>