If I modify /etc/ntp.conf to add say my ADSL router, freebsd-update will not retrieve any new version. Instead, it should maintain say /etc/ntp.conf.default, and let the user sort it out. If I dare to modify a user-modifiable file: aneurin# freebsd-update fetch Looking up update.FreeBSD.org mirrors... none found. Fetching metadata signature for 9.3-RELEASE from update.FreeBSD.org... done. Fetching metadata index... done. Inspecting system... done. Preparing to download files... done. The following files are affected by updates, but no changes have been downloaded because the files have been modified locally: /etc/ntp.conf The following files will be removed as part of updating to 9.3-RELEASE-p30: aneurin# If I capitulate and put the original back: aneurin# freebsd-update fetch Looking up update.FreeBSD.org mirrors... none found. Fetching metadata signature for 9.3-RELEASE from update.FreeBSD.org... done. Fetching metadata index... done. Inspecting system... done. Preparing to download files... done. The following files will be removed as part of updating to 9.3-RELEASE-p30: aneurin# I then have to restore my changes...
Any progress on this, anyone? It's been two months, and so far not even so much as an acknowledgement...
How are you using freebsd-update.conf? The default version seems (haven't tested) that it should handle merging properly...
(In reply to Ngie Cooper from comment #2) Sorry for the delay; things sorta got away from me... Here are the bits I changed: # Components of the base system which should be kept updated. Components world kernel # DH 3/11/15 Components src world kernel (I don't keep source here; no room on the disk.) # Directory in which to store downloaded updates and temporary # files used by FreeBSD Update. # WorkDir /var/db/freebsd-update # DH WorkDir /usr/local/freebsd-update (I have more room on /usr/local than I do on /var.)
Was my reply of any use?
Sorry, just saw this PR now. Short answer, freebsd-update does merging for files in /etc/ but only when upgrading between releases; when I wrote it we didn't expect to ever have security updates making changes to files in /etc/.
Well, it's not a security update as such; merely a way to not have to manually update ntp.conf by hand, as it's user-maintained. Will there be a resolution?
I'm having the same issue. If I modify /etc/ntp.conf, freebsd-update always wants to update it: /home/admin% sudo freebsd-update fetch Looking up update.FreeBSD.org mirrors... 4 mirrors found. Fetching metadata signature for 10.1-RELEASE from update5.freebsd.org... done. Fetching metadata index... done. Inspecting system... done. Preparing to download files... done. No updates needed to update system to 10.1-RELEASE-p37. /home/admin% echo "tinker panic 0" >> /etc/ntp.conf /home/admin% sudo freebsd-update fetch Looking up update.FreeBSD.org mirrors... 4 mirrors found. Fetching metadata signature for 10.1-RELEASE from update5.freebsd.org... done. Fetching metadata index... done. Inspecting system... done. Preparing to download files... done. The following files are affected by updates, but no changes have been downloaded because the files have been modified locally: /etc/ntp.conf No updates needed to update system to 10.1-RELEASE-p37. /home/admin%
Need help - update failing? <https://old.reddit.com/r/freebsd/comments/15lmvna/-/> Why is freebsd-update (or maybe etcupdate?) suddenly incapable of merging sshd_config? <https://old.reddit.com/r/freebsd/comments/15rhk7x/-/> I'll draw attention to comment 5 here.
<https://docs.freebsd.org/en/books/handbook/book/#freebsdupdate-security-patches> > Applying Security Patches This section of the FreeBSD Handbook will benefit from: 1. a (blue ⓘ) note box describing the bug 2. subsequent text, not within the box, to describe a workaround – maybe with /etc/ssh/sshd_config as an example.
(In reply to Graham Perrin ◐ from comment #9) See also: bug 273155 > 273155 – Add a BUGS section to freebsd-update(8)
<https://github.com/freebsd/freebsd-src/pull/826>
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=a8c1ffca7a594733a91c1513d0185be174d1115f commit a8c1ffca7a594733a91c1513d0185be174d1115f Author: Graham Perrin <grahamperrin@gmail.com> AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-02-02 20:35:25 +0000 freebsd-update(8): Explain conflicts in /etc Unlike etcupdate(8), freebsd-update only prints the files with conflicts. It doesn't merge. PR: 204549 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 usr.sbin/freebsd-update/freebsd-update.8 | 9 +++++++++ 1 file changed, 9 insertions(+)
^Triage: assign to committer.
Well, I tagged this as MFC... then read the bug closely... this is a different bug.
A commit in branch stable/14 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=85f889aa9cdad831a68b42050d1adb47d4eb960d commit 85f889aa9cdad831a68b42050d1adb47d4eb960d Author: Graham Perrin <grahamperrin@gmail.com> AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2024-10-21 15:46:41 +0000 freebsd-update(8): Explain conflicts in /etc Unlike etcupdate(8), freebsd-update only prints the files with conflicts. It doesn't merge. PR: 204549 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 (cherry picked from commit a8c1ffca7a594733a91c1513d0185be174d1115f) usr.sbin/freebsd-update/freebsd-update.8 | 9 +++++++++ 1 file changed, 9 insertions(+)
A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c3f49fac756f98555c516b54b680c625becb61 commit b9c3f49fac756f98555c516b54b680c625becb61 Author: Graham Perrin <grahamperrin@gmail.com> AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2024-10-21 15:48:45 +0000 freebsd-update(8): Explain conflicts in /etc Unlike etcupdate(8), freebsd-update only prints the files with conflicts. It doesn't merge. PR: 204549 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 (cherry picked from commit a8c1ffca7a594733a91c1513d0185be174d1115f) (cherry picked from commit 85f889aa9cdad831a68b42050d1adb47d4eb960d) usr.sbin/freebsd-update/freebsd-update.8 | 9 +++++++++ 1 file changed, 9 insertions(+)