From nobody Tue Aug 20 05:09:28 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 4WnyF834Gpz5VGSg for ; Tue, 20 Aug 2024 05:09:32 +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 4WnyF812hMz4SrR for ; Tue, 20 Aug 2024 05:09: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 47K59SWh001170; Mon, 19 Aug 2024 23:09:28 -0600 (MDT) (envelope-from freebsd@dreamchaser.org) Message-ID: <0556eb13-5b41-4670-ad48-827867a2b3c9@dreamchaser.org> Date: Mon, 19 Aug 2024 21:09:28 -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: Content-Language: en-US From: Gary Aitken In-Reply-To: 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]); Mon, 19 Aug 2024 23:09:29 -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]); Mon, 19 Aug 2024 23:09:29 -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: 4WnyF812hMz4SrR 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