Bug 204549 - freebsd-update should fetch e.g. /etc/ntp.conf.default
Summary: freebsd-update should fetch e.g. /etc/ntp.conf.default
Status: New
Alias: None
Product: Base System
Classification: Unclassified
Component: conf (show other bugs)
Version: 9.3-RELEASE
Hardware: Any Any
: --- Affects Many People
Assignee: freebsd-bugs mailing list
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-11-14 20:44 UTC by dave
Modified: 2016-12-20 21:55 UTC (History)
4 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description dave 2015-11-14 20:44:52 UTC
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...
Comment 1 dave 2016-01-09 17:33:44 UTC
Any progress on this, anyone? It's been two months, and so far not even so much as an acknowledgement...
Comment 2 Enji Cooper freebsd_committer 2016-01-09 20:43:43 UTC
How are you using freebsd-update.conf? The default version seems (haven't tested) that it should handle merging properly...
Comment 3 dave 2016-06-10 20:44:14 UTC
(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.)
Comment 4 dave 2016-07-14 00:07:21 UTC
Was my reply of any use?
Comment 5 Colin Percival freebsd_committer 2016-07-14 00:36:11 UTC
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/.
Comment 6 dave 2016-07-25 23:01:39 UTC
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?
Comment 7 Erik Cederstrand 2016-09-02 07:42:43 UTC
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%