From nobody Tue Aug 20 14:27:30 2024 X-Original-To: freebsd-questions@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WpBd114V1z5TDYv for ; Tue, 20 Aug 2024 14:27:33 +0000 (UTC) (envelope-from freebsd@dreamchaser.org) Received: from ns.dreamchaser.org (ns.dreamchaser.org [66.109.141.57]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-256) client-digest SHA256) (Client CN "discoveriesinwood.com", Issuer "E5" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WpBd06JJcz4mFp for ; Tue, 20 Aug 2024 14:27:32 +0000 (UTC) (envelope-from freebsd@dreamchaser.org) Authentication-Results: mx1.freebsd.org; none Received: from [192.168.151.122] (breakaway.dreamchaser.org [192.168.151.122]) by ns.dreamchaser.org (8.17.1/8.17.1) with ESMTP id 47KERUYc002995; Tue, 20 Aug 2024 08:27:30 -0600 (MDT) (envelope-from freebsd@dreamchaser.org) Message-ID: Date: Tue, 20 Aug 2024 06:27:30 -0800 List-Id: User questions List-Archive: https://lists.freebsd.org/archives/freebsd-questions List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: freebsd-questions@freebsd.org Sender: owner-freebsd-questions@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Reply-To: freebsd@dreamchaser.org Subject: Re: freebsd-update "No changes have been downloaded" "files have been modified locally" To: list_freebsd@bluerosetech.com, FreeBSD Mailing List References: <0556eb13-5b41-4670-ad48-827867a2b3c9@dreamchaser.org> <557e371a-4348-a23e-199c-d47c36a6649a@bluerosetech.com> Content-Language: en-US From: Gary Aitken In-Reply-To: <557e371a-4348-a23e-199c-d47c36a6649a@bluerosetech.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Greylist: inspected by milter-greylist-4.6.4 (ns.dreamchaser.org [192.168.151.101]); Tue, 20 Aug 2024 08:27:30 -0600 (MDT) for IP:'192.168.151.122' DOMAIN:'breakaway.dreamchaser.org' HELO:'[192.168.151.122]' FROM:'freebsd@dreamchaser.org' RCPT:'' X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.4 (ns.dreamchaser.org [192.168.151.101]); Tue, 20 Aug 2024 08:27:30 -0600 (MDT) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:21947, ipnet:66.109.128.0/19, country:US] X-Rspamd-Queue-Id: 4WpBd06JJcz4mFp 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