From nobody Tue Sep 16 23:39:59 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 4cRJKt1tbfz67pLy for ; Tue, 16 Sep 2025 23:40:18 +0000 (UTC) (envelope-from freebsd@gushi.org) Received: from prime.gushi.org (prime.gushi.org [IPv6:2620:137:6000:10::142]) (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 (secp384r1) client-digest SHA384) (Client CN "prime.gushi.org", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRJKt0cJqz3wj5 for ; Tue, 16 Sep 2025 23:40:18 +0000 (UTC) (envelope-from freebsd@gushi.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple ([IPv6:2001:500:6b:200:c000:0:0:203]) (authenticated bits=0) by prime.gushi.org (8.18.1/8.18.1) with ESMTPSA id 58GNeBPv070133 (version=TLSv1.2 cipher=ECDHE-ECDSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Sep 2025 23:40:11 GMT (envelope-from freebsd@gushi.org) DKIM-Filter: OpenDKIM Filter v2.10.3 prime.gushi.org 58GNeBPv070133 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gushi.org; s=prime2014; t=1758066012; bh=1ZYfKwb2ViCDblhdAqNZbBoKWO8CaAFX0n7ZMeJDqws=; h=Subject:From:In-Reply-To:Date:Cc:References:To; z=Subject:=20Re:=20incantation=20for=20etcupdate=20to=20just=20blow =20away=20all=20old=20things?|From:=20"Dan=20Mahoney=20(Ports)"=20 |In-Reply-To:=20|Date:=20Tue,=2016=20Sep=202025=2016:39:59=20-0700 |Cc:=20FreeBSD=20Current=20|Reference s:=20=0D=0A=20|To:=20sgk@troutmask.ap l.washington.edu; b=TNZhyExAyGTizWokAbambUjkuPXDzasHis1oXk9DdBLCeVWOjGObqGtcIegsOT0S8 XrKDQ2NoU9H9EXuvoqR/VqnQeAR+E7AyHs7GpXNTkPwTo1FDbcWVVZWBjQSaMp025y VT52xEUyp4doWZbm3MzZvWlqLSVPg0BtsNhlpTyttY5RkBlcoJvuTgZX/R1B0isMak O1ch1Z1eXLBE2L5LnzJiuHjZrGOgQDxYSiDts+hfx/VadiaEpEil7nncz19Uqu5XmT Hi57ChbDAwCHQTd27poy1gBkbwCHDeZIttAvfOvcO3GbRHdjcVMevUUwbO1IjZxzJg XMp5hOtSSAKSw== X-Authentication-Warning: prime.gushi.org: Host [IPv6:2001:500:6b:200:c000:0:0:203] claimed to be smtpclient.apple Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3864.100.1.1.5\)) Subject: Re: incantation for etcupdate to just blow away all old things? From: "Dan Mahoney (Ports)" In-Reply-To: Date: Tue, 16 Sep 2025 16:39:59 -0700 Cc: FreeBSD Current Content-Transfer-Encoding: quoted-printable Message-Id: <75673CAD-3CED-42B0-BE61-23097674C88F@gushi.org> References: To: sgk@troutmask.apl.washington.edu X-Mailer: Apple Mail (2.3864.100.1.1.5) X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (prime.gushi.org [IPv6:2620:137:6000:10:0:0:0:142]); Tue, 16 Sep 2025 23:40:12 +0000 (UTC) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:393507, ipnet:2620:137:6000::/44, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cRJKt0cJqz3wj5 > On Sep 16, 2025, at 4:35=E2=80=AFPM, Steve Kargl = wrote: >=20 > On Tue, Sep 16, 2025 at 04:11:17PM -0700, Dan Mahoney (Ports) wrote: >> Hey there folks, >>=20 >> 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. >>=20 >> 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). >>=20 >> 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?" >>=20 >=20 > 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? -Dan=