From nobody Tue Sep 16 23:11:17 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 4cRHhz2VLPz67m4l for ; Tue, 16 Sep 2025 23:11:47 +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 4cRHht6sKxz3rWL for ; Tue, 16 Sep 2025 23:11:42 +0000 (UTC) (envelope-from freebsd@gushi.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gushi.org header.s=prime2014 header.b=KFCkAgNX; dmarc=pass (policy=none) header.from=gushi.org; spf=pass (mx1.freebsd.org: domain of freebsd@gushi.org designates 2620:137:6000:10::142 as permitted sender) smtp.mailfrom=freebsd@gushi.org 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 58GNBYHU061315 (version=TLSv1.2 cipher=ECDHE-ECDSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 16 Sep 2025 23:11:35 GMT (envelope-from freebsd@gushi.org) DKIM-Filter: OpenDKIM Filter v2.10.3 prime.gushi.org 58GNBYHU061315 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gushi.org; s=prime2014; t=1758064295; bh=xJvHpetvMq8SOTR9u7rv/dkJ+Z+dUZQRi0GWdI8gbIM=; h=From:Subject:Date:To; z=From:=20"Dan=20Mahoney=20(Ports)"=20|Subject:= 20incantation=20for=20etcupdate=20to=20just=20blow=20away=20all=20 old=20things?|Date:=20Tue,=2016=20Sep=202025=2016:11:17=20-0700|To :=20FreeBSD=20Current=20; b=KFCkAgNXPAR6nCTMJspZZy+kJf3dF80ocOUqaPVsWm0hio5begPqSlmgumeIUH+TW nj+3Ncy1j+Ppfp/iH7WC2qlBiyEb8Y8QsoxWLsaUpmY6BqTInGiVYH3KVG1nlvdLpP sqOB5jMDj9RPcubwc3auNqKVwqDsW3OB/YMzX6eqiH3OQyGYGhKrwtvoIG/xGkIWVq W45BjtDehwRG189zrURphgvdPkrzzgJMllpPmx0pb7BpmfbGv3DuRg2eFjcx602yw8 ynX5YIojF470jIV6Rh3xoq0Kj962DCyp4XG2vyyxgocRjZFT5qbRV2SsUi2IfYhyqt UHHKLOt3BhwEg== X-Authentication-Warning: prime.gushi.org: Host [IPv6:2001:500:6b:200:c000:0:0:203] claimed to be smtpclient.apple From: "Dan Mahoney (Ports)" Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 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: incantation for etcupdate to just blow away all old things? Message-Id: Date: Tue, 16 Sep 2025 16:11:17 -0700 To: FreeBSD Current 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:11:35 +0000 (UTC) X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.06 / 15.00]; DWL_DNSWL_LOW(-1.00)[gushi.org:dkim]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; NEURAL_HAM_LONG(-0.76)[-0.760]; DMARC_POLICY_ALLOW(-0.50)[gushi.org,none]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; R_DKIM_ALLOW(-0.20)[gushi.org:s=prime2014]; ONCE_RECEIVED(0.20)[]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[gushi.org:+]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; TO_DN_ALL(0.00)[]; HAS_XAW(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:393507, ipnet:2620:137:6000::/44, country:US]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+] X-Rspamd-Queue-Id: 4cRHht6sKxz3rWL 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?" -Dan=