From nobody Tue Aug 20 12:15:09 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 4Wp7hP5nkfz5T1Sl for ; Tue, 20 Aug 2024 12:15:17 +0000 (UTC) (envelope-from list_freebsd@bluerosetech.com) Received: from echo.brtsvcs.net (echo.brtsvcs.net [208.111.40.118]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wp7hP1nLyz4P9W for ; Tue, 20 Aug 2024 12:15:17 +0000 (UTC) (envelope-from list_freebsd@bluerosetech.com) Authentication-Results: mx1.freebsd.org; none Received: from chombo.houseloki.net (65-100-43-2.dia.static.qwest.net [65.100.43.2]) by echo.brtsvcs.net (Postfix) with ESMTPS id B2E6438D3F; Tue, 20 Aug 2024 12:15:10 +0000 (UTC) Received: from [10.26.25.100] (ivy.pas.ds.pilgrimaccounting.com [10.26.25.100]) by chombo.houseloki.net (Postfix) with ESMTPSA id 21FCF4C73B; Tue, 20 Aug 2024 05:15:10 -0700 (PDT) Message-ID: <557e371a-4348-a23e-199c-d47c36a6649a@bluerosetech.com> Date: Tue, 20 Aug 2024 05:15:09 -0700 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/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: freebsd-update "No changes have been downloaded" "files have been modified locally" To: freebsd@dreamchaser.org, FreeBSD Mailing List References: <0556eb13-5b41-4670-ad48-827867a2b3c9@dreamchaser.org> Content-Language: en-US From: list_freebsd@bluerosetech.com In-Reply-To: <0556eb13-5b41-4670-ad48-827867a2b3c9@dreamchaser.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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:36236, ipnet:208.111.40.0/24, country:US] X-Rspamd-Queue-Id: 4Wp7hP1nLyz4P9W 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.