From nobody Tue Sep 16 23:35:52 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 4cRJDp6dYHz67p1w for ; Tue, 16 Sep 2025 23:35:54 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (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 4cRJDp3xJDz3vXN for ; Tue, 16 Sep 2025 23:35:54 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Authentication-Results: mx1.freebsd.org; none Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.18.1/8.18.1) with ESMTP id 58GNZqvS043226; Tue, 16 Sep 2025 16:35:52 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) DKIM-Filter: OpenDKIM Filter v2.10.3 troutmask.apl.washington.edu 58GNZqvS043226 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=troutmask.apl.washington.edu; s=troutmask; t=1758065752; bh=Qu1DP91+BXrAEmnM9pBeEGhLYQ1e9ZNoBpP1L4+FyOU=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=dillbMono6boC9X8357jMpY4SmtN9nvOiA6Wx0GJ1kqQToZyXWqnrWgl84nboPyS+ JOG+2oT+b71XSmp9zLDhyFVkXDV/1oo786BbFcUbOFREP/1BR0GRecNdcoIsl1cKf3 cVxUOEt1TvRdLWSOdX52czTh1m+DSAe6nxQjY1HCzY0aD5efF5Z2EmJAmgovXEkLL4 e2X77gRlEZmFvM7HIQi3L5ylryI4U3wDG4n4GLuD7fXUIWpxGyKSLeUfGDr0XCSqb6 VYV7yk27bpE9szs3ojgWa/EJoSiqxbBrnJdfXlt6nafKx+SuBU+CA1QCAsbLhInTJ2 sfJVy9M7b72AA== Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.18.1/8.18.1/Submit) id 58GNZqMU043225; Tue, 16 Sep 2025 16:35:52 -0700 (PDT) (envelope-from sgk) Date: Tue, 16 Sep 2025 16:35:52 -0700 From: Steve Kargl To: "Dan Mahoney (Ports)" Cc: FreeBSD Current Subject: Re: incantation for etcupdate to just blow away all old things? Message-ID: Reply-To: sgk@troutmask.apl.washington.edu References: 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 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cRJDp3xJDz3vXN 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 -- Steve