Add /boot/device.hints to the list of files which will have local

modifications merged.  I had initially expected that people would
put any local changes into /boot/loader.conf, but it turns out that
editing /boot/device.hints is something many people do.

Suggested by:	Jaakko Heinonen
MFC after:	1 week
This commit is contained in:
Colin Percival 2008-03-25 12:13:12 +00:00
parent fd0963d156
commit a3a76c6897

View file

@ -28,7 +28,7 @@ UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
# 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: