conf/121783: [patch] freebsd-update(8) upgrade overwrites device.hints

[Jaakko Heinonen]

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

From: Jaakko Heinonen <jh at saunalahti.fi>
To: bug-followup at 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--