diff options
| author | glebius <glebius@FreeBSD.org> | 2013-11-14 09:14:33 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-11-14 09:14:33 +0000 |
| commit | 233591315f07c0bb620f209d3812b059d73c37e0 (patch) | |
| tree | aa130f6ea72ff311ec60e685ab3b669531056790 /etc/freebsd-update.conf | |
| parent | fa658a0f7232de870d75a11f6dc89e300cdbb738 (diff) | |
| download | FreeBSD-src-233591315f07c0bb620f209d3812b059d73c37e0.zip FreeBSD-src-233591315f07c0bb620f209d3812b059d73c37e0.tar.gz | |
Merge r257694 from head:
Remove remnants of BIND from /etc, since there is no BIND in base now.
Sorry, that would break users running head and BIND from ports, since
ports rely on these scripts. The ports will be fixed soon.
Approved by: re (kib)
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 4410903..7f09170 100644 --- a/etc/freebsd-update.conf +++ b/etc/freebsd-update.conf @@ -35,7 +35,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/ /boot/device.hints +MergeChanges /etc/ /boot/device.hints ### Default configuration options: |
