diff options
| author | cperciva <cperciva@FreeBSD.org> | 2008-03-25 12:13:12 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2008-03-25 12:13:12 +0000 |
| commit | ad5120d8795591a6f892e623f1353d204e5ac20f (patch) | |
| tree | e98a6a59fbcbb2e4653b65fcda86b17204cdcdd1 /etc/freebsd-update.conf | |
| parent | e212b28cc6ee26e864b6342ab5858510c28de531 (diff) | |
| download | FreeBSD-src-ad5120d8795591a6f892e623f1353d204e5ac20f.zip FreeBSD-src-ad5120d8795591a6f892e623f1353d204e5ac20f.tar.gz | |
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
Diffstat (limited to 'etc/freebsd-update.conf')
| -rw-r--r-- | etc/freebsd-update.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/freebsd-update.conf b/etc/freebsd-update.conf index 001042e..b46aefc 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: |
