From nobody Thu Jun 15 17:48:54 2023 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 4QhqY53nNZz4dJw6 for ; Thu, 15 Jun 2023 17:49:13 +0000 (UTC) (envelope-from pmh@hausen.com) Received: from mail2.pluspunkthosting.de (mail2.pluspunkthosting.de [217.29.33.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QhqY51X92z4ZgL for ; Thu, 15 Jun 2023 17:49:13 +0000 (UTC) (envelope-from pmh@hausen.com) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (87.138.185.145) by mail2.pluspunkthosting.de (Axigen) with (ECDHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPSA id 22FF28; Thu, 15 Jun 2023 19:49:04 +0200 Content-Type: text/plain; charset=us-ascii 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 \(3731.600.7\)) Subject: Re: Using etcupdate resolve, was Re: Surprise null root password From: "Patrick M. Hausen" In-Reply-To: Date: Thu, 15 Jun 2023 19:48:54 +0200 Cc: Current FreeBSD Content-Transfer-Encoding: 7bit Message-Id: References: <8721FE04-3769-473C-BAAD-EB0A4FCFA1D7.ref@yahoo.com> <8721FE04-3769-473C-BAAD-EB0A4FCFA1D7@yahoo.com> To: bob prohaska X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4QhqY51X92z4ZgL X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16188, ipnet:217.29.32.0/20, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Hi, > Am 15.06.2023 um 19:26 schrieb bob prohaska : > The puzzle at this point is what to do. It's looks like the > points of interest are the lines marked "yours" and "new", > but I'll admit to bafflement which to modify and whether > the modifications needed include the <<<< and >>>>> characters. Everything between the line labelled "yours" and the line "=======" is your version. Everything between the line "=======" and the line labelled "new" is the new version. You are supposed to bring the file to the desired final state removing all three "marker" lines. So in the two simple cases to keep your version delete the line labelled "yours" and everything from "=======" to "new" including the markers. To keep the new version delete everything from "yours" to "=======" including the markers and delete the marker "new". Or any combination thereof. Produce a syntactically correct config file with the desired content and remove all the markers. I don't know if there is any documentation. When I first encountered that during freebsd-update it looked obvious to me what to do. HTH, Patrick