From nobody Wed Sep 17 00:56:58 2025 X-Original-To: freebsd-current@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 4cRL2Y3J12z67vqQ for ; Wed, 17 Sep 2025 00:57:09 +0000 (UTC) (envelope-from kargls@comcast.net) Received: from resqmta-h2p-567037.sys.comcast.net (resqmta-h2p-567037.sys.comcast.net [IPv6:2001:558:fd02:2446::2]) (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 4cRL2X39Jzz49XD for ; Wed, 17 Sep 2025 00:57:08 +0000 (UTC) (envelope-from kargls@comcast.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=comcast.net header.s=20190202a header.b=vT2p8vHg; dmarc=pass (policy=reject) header.from=comcast.net; spf=pass (mx1.freebsd.org: domain of kargls@comcast.net designates 2001:558:fd02:2446::2 as permitted sender) smtp.mailfrom=kargls@comcast.net Received: from resomta-h2p-555029.sys.comcast.net ([96.102.179.203]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resqmta-h2p-567037.sys.comcast.net with ESMTPS id ycVTul3a6ZVrdygTkuICOu; Wed, 17 Sep 2025 00:57:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=20190202a; t=1758070620; bh=I6nzjheldrIG7OY/8FU0ZBxdtBUOPKLI7tHvr2exFqU=; h=Received:Received:Message-ID:Date:MIME-Version:Subject:To:From: Content-Type:Xfinity-Spam-Result; b=vT2p8vHgplNEHNZR+5Kt48cS/yjAq34MjoA+FWyWsYfOeug6OPF/Mh4I5QbbLWTfV 5Gh7V/uZtPQfrEsLnchI4/oPowBBC+tvqjI698Hg6UmBox8OoFQAjkXdorAU4W2cgG sy4QHsV/WN9EuHlbQ82TBbhRYtXqhckwnlSyvWCbo+JstgiVnwyjK+8KivkgAw6YgD ly30FpQnVXktpfaGsNLWV+UZotoUgBBQ8cXwreSVTjr8et42Lkp6Lbe6LSMhvNrh2l TfFVqrCWyDKVWiM4eO7F5XUC5th0Ud9EPmGG9MSqkNziYq9QctGO+/RhAChIhDp3mO Fg4B1YqlEjXjg== Received: from [10.0.0.30] ([73.83.213.54]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resomta-h2p-555029.sys.comcast.net with ESMTPSA id ygTiu59VKYri1ygTju4LXo; Wed, 17 Sep 2025 00:56:59 +0000 Message-ID: <76a68bca-f0dd-4f7a-85a1-61c300abe031@comcast.net> Date: Tue, 16 Sep 2025 17:56:58 -0700 List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: incantation for etcupdate to just blow away all old things? To: freebsd-current@freebsd.org References: <75673CAD-3CED-42B0-BE61-23097674C88F@gushi.org> Content-Language: en-US From: Steve Kargl In-Reply-To: <75673CAD-3CED-42B0-BE61-23097674C88F@gushi.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfGXElxmSe+DH3fQdOog1gHSAMtUidldnKH8evZHdQ1IJO1vsbKMpWbkKDYY/JiOkyP/pGNQHYUe8U38GJKDmgZGiyzwD3ku28M8JFrUS0zqPH8FSDI/3 R5TNsdMJfC7yJoMoT8qhIP07qOqIUdQ3dUbEXE5L9UEgChRc76UlHkahHv7avLgKwb9+gFhxQGVbrg== X-Spamd-Bar: / X-Spamd-Result: default: False [0.01 / 15.00]; HFILTER_HELO_5(3.00)[resqmta-h2p-567037.sys.comcast.net]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; DMARC_POLICY_ALLOW(-0.50)[comcast.net,reject]; R_DKIM_ALLOW(-0.20)[comcast.net:s=20190202a]; R_SPF_ALLOW(-0.20)[+ip6:2001:558:fd02:2446::/64]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; DWL_DNSWL_NONE(0.00)[comcast.net:dkim]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_FROM(0.00)[comcast.net]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[comcast.net:+]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[comcast.net]; RCVD_IN_DNSWL_NONE(0.00)[96.102.179.203:received] X-Rspamd-Queue-Id: 4cRL2X39Jzz49XD On 9/16/25 16:39, Dan Mahoney (Ports) wrote: > > >> On Sep 16, 2025, at 4:35 PM, Steve Kargl wrote: >> >> On Tue, Sep 16, 2025 at 04:11:17PM -0700, Dan Mahoney (Ports) wrote: >>> Hey there folks, >>> >>> In doing a bunch of updates on my 15 VM recently to get around some of the recent breakages, I haven't been fully religious about running etcupdate every time, and it's now complaining that I have some results from a prior merge. >>> >>> The man page is *long*, and we have puppet manifests to alter the few things we care about from a stock system (mostly some sshd stuff). >>> >>> Is there a simple etcupdate command that says "I don't care about fancy 3-way merges and diffs, please just blow my /etc back to stock and I'll correct it with puppet?" >>> >> >> etcupdate revert file > > that seems to be for a single file: > > " The revert mode is used to restore the stock versions of files. In this > mode, etcupdate installs the stock version of requested files. This mode > cannot be used to restore directories, only individual files. > " > > is there a mechanism for *all* of /etc? Never tried it, but you may be about to do find /etc -type f | xargs etcupdate revert -- steve