Date: Tue, 20 Aug 2024 06:27:30 -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: <f99b7a5f-85bc-488c-ac73-d081fa581a80@dreamchaser.org> In-Reply-To: <557e371a-4348-a23e-199c-d47c36a6649a@bluerosetech.com> References: <e10d34b7-3583-403b-be10-85054ac3469c@dreamchaser.org> <a71d3762-0314-439c-2a40-49b8bacbd505@bluerosetech.com> <0556eb13-5b41-4670-ad48-827867a2b3c9@dreamchaser.org> <557e371a-4348-a23e-199c-d47c36a6649a@bluerosetech.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 8/20/24 04:15, list_freebsd@bluerosetech.com wrote: > On 2024-08-19 22:09, Gary Aitken wrote: >> 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? > > It's because freebsd-update only provides the three-way merge > functionality during release upgrades. It's not done for regular > updates. I haven't the slightest why. > > Unfortunately you're left to do the merge by hand in this case. > > FWIW, you can have a local config while leaving the distributed file > unmodified by using a separate sshd_config.local file. Put your > changes in that, add: > > Include /etc/ssh/sshd_config > > as the last line, and add: > > sshd_flags="-f /etc/ssh/sshd_config.local" > > to /etc/rc.conf. Thanks. Still debating whether to do this or not, as the error was a reminder that I've tweaked it and to review it. Gary
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f99b7a5f-85bc-488c-ac73-d081fa581a80>