Date: Tue, 16 Sep 2025 16:35:52 -0700 From: Steve Kargl <sgk@troutmask.apl.washington.edu> To: "Dan Mahoney (Ports)" <freebsd@gushi.org> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: incantation for etcupdate to just blow away all old things? Message-ID: <aMn0WM9V9xLNduLC@troutmask.apl.washington.edu> In-Reply-To: <AA91698D-1A81-4D67-B607-FDB87D9B4A41@gushi.org>
index | next in thread | previous in thread | raw e-mail
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 -- Stevehelp
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aMn0WM9V9xLNduLC>