From a3a76c689777aa910c3a8a94c5222ea77d2bdb84 Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Tue, 25 Mar 2008 12:13:12 +0000 Subject: [PATCH] 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 --- etc/freebsd-update.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/freebsd-update.conf b/etc/freebsd-update.conf index 001042e5420..b46aefcc7bd 100644 --- a/etc/freebsd-update.conf +++ b/etc/freebsd-update.conf @@ -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: