Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Aug 2024 21:09:28 -0800
From:      Gary Aitken <freebsd@dreamchaser.org>
To:        list_freebsd@bluerosetech.com, FreeBSD Mailing List <freebsd-questions@freebsd.org>
Subject:   Re: freebsd-update "No changes have been downloaded" "files have been modified locally"
Message-ID:  <0556eb13-5b41-4670-ad48-827867a2b3c9@dreamchaser.org>
In-Reply-To: <a71d3762-0314-439c-2a40-49b8bacbd505@bluerosetech.com>
References:  <e10d34b7-3583-403b-be10-85054ac3469c@dreamchaser.org> <a71d3762-0314-439c-2a40-49b8bacbd505@bluerosetech.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On 8/19/24 15:48, list_freebsd@bluerosetech.com wrote:
> On 2024-08-19 13:50, Gary Aitken wrote:

>> freebsd-update fetch ... The following files are affected by
>> updates. No changes have been downloaded, however, because the
>> files have been modified locally: /etc/ssh/sshd_config

> For Cold War legacy[1] reasons[2], the in-tree copy of sshd_config
> lives at:
> 
> src/crypto/openssh/sshd_config

...
> /var/db/etcupdate/current contains the most recent reference tree
> extracted from /usr/src by etcupdate(8).  etcupdate uses it to update
> /etc and a few other bits as part of a source upgrade.
> 
> It isn't used by freebsd-update, so won't necessarily be correct for
> the installed OS.

Thanks, forgot about all that.

Why doesn't "freebsd-update" attempt to merge the existing
shd_config file with the RELEASE one like it does for other files,
and give me an editor to resolve differences?  Is that because it
lives in a non-standard place?

Thanks,

Gary
  

Gary



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0556eb13-5b41-4670-ad48-827867a2b3c9>