From owner-freebsd-bugs@FreeBSD.ORG  Mon Mar 17 15:40:06 2008
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27997106568E
	for <freebsd-bugs@hub.freebsd.org>;
	Mon, 17 Mar 2008 15:40:06 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 117478FC12
	for <freebsd-bugs@hub.freebsd.org>;
	Mon, 17 Mar 2008 15:40:06 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m2HFe5db080511
	for <freebsd-bugs@freefall.freebsd.org>; Mon, 17 Mar 2008 15:40:05 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m2HFe5CM080510;
	Mon, 17 Mar 2008 15:40:05 GMT (envelope-from gnats)
Date: Mon, 17 Mar 2008 15:40:05 GMT
Message-Id: <200803171540.m2HFe5CM080510@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Jaakko Heinonen <jh@saunalahti.fi>
Cc: 
Subject: Re: conf/121783: [patch] freebsd-update(8) upgrade overwrites
	device.hints
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Jaakko Heinonen <jh@saunalahti.fi>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Mar 2008 15:40:06 -0000

The following reply was made to PR conf/121783; it has been noted by GNATS.

From: Jaakko Heinonen <jh@saunalahti.fi>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/121783: [patch] freebsd-update(8) upgrade overwrites
	device.hints
Date: Mon, 17 Mar 2008 17:38:24 +0200

 --yNb1oOkm5a9FJOVX
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 
 
 --yNb1oOkm5a9FJOVX
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="freebsd-update-device.hints.diff"
 
 Index: freebsd-update.conf
 ===================================================================
 RCS file: /home/ncvs/src/etc/freebsd-update.conf,v
 retrieving revision 1.3
 diff -u -r1.3 freebsd-update.conf
 --- freebsd-update.conf	28 Nov 2007 22:45:09 -0000	1.3
 +++ freebsd-update.conf	17 Mar 2008 09:27:12 -0000
 @@ -28,7 +28,7 @@
  
  # When upgrading to a new FreeBSD release, files which match MergeChanges
  # will have any local changes merged into the version from the new release.
 -MergeChanges /etc/ /var/named/etc/
 +MergeChanges /etc/ /var/named/etc/ /boot/device.hints
  
  ### Default configuration options:
  
 
 --yNb1oOkm5a9FJOVX--