From nobody Thu Jun 15 17:26:48 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 4Qhq362LMqz4ccy5 for ; Thu, 15 Jun 2023 17:26:42 +0000 (UTC) (envelope-from fbsd@www.zefox.net) Received: from www.zefox.net (www.zefox.net [50.1.20.27]) (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 RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.zefox.com", Issuer "www.zefox.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qhq353f48z4ShT for ; Thu, 15 Jun 2023 17:26:41 +0000 (UTC) (envelope-from fbsd@www.zefox.net) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of fbsd@www.zefox.net has no SPF policy when checking 50.1.20.27) smtp.mailfrom=fbsd@www.zefox.net; dmarc=none Received: from www.zefox.net (localhost [127.0.0.1]) by www.zefox.net (8.17.1/8.15.2) with ESMTPS id 35FHQmIs026966 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 15 Jun 2023 10:26:48 -0700 (PDT) (envelope-from fbsd@www.zefox.net) Received: (from fbsd@localhost) by www.zefox.net (8.17.1/8.15.2/Submit) id 35FHQmTg026965; Thu, 15 Jun 2023 10:26:48 -0700 (PDT) (envelope-from fbsd) Date: Thu, 15 Jun 2023 10:26:48 -0700 From: bob prohaska To: Current FreeBSD Cc: bob prohaska Subject: Using etcupdate resolve, was Re: Surprise null root password Message-ID: References: <8721FE04-3769-473C-BAAD-EB0A4FCFA1D7.ref@yahoo.com> <8721FE04-3769-473C-BAAD-EB0A4FCFA1D7@yahoo.com> 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-Result: default: False [-1.08 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.976]; WWW_DOT_DOMAIN(0.50)[]; MID_RHS_WWW(0.50)[]; MIME_GOOD(-0.10)[text/plain]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; MIME_TRACE(0.00)[0:+]; R_SPF_NA(0.00)[no SPF record]; ASN(0.00)[asn:7065, ipnet:50.1.16.0/20, country:US]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; TO_DN_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[zefox.net]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4Qhq353f48z4ShT X-Spamd-Bar: - X-ThisMailContainsUnwantedMimeParts: N Here's an example of the puzzles faced when using etcupdate that have so far proved baffling: On running etcupdate resolve, the system reports Resolving conflict in '/etc/mtree/BSD.tests.dist': Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: df --- /etc/mtree/BSD.tests.dist 2023-05-29 08:29:48.174762000 -0700 +++ /var/db/etcupdate/conflicts/etc/mtree/BSD.tests.dist 2023-06-13 22:55:04.284491000 -0700 @@ -442,6 +442,16 @@ .. ifconfig .. +<<<<<<< yours +||||||| original + md5 + .. +======= + ipfw + .. + md5 + .. +>>>>>>> new mdconfig .. nvmecontrol Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: e Selecting option e for edit brings up what appears to be a vi window, using search I can find the line with mdconfig: <<<<<<< yours ||||||| original md5 .. ======= ipfw .. md5 .. >>>>>>> new mdconfig .. nvmecontrol .. pfctl files .. .. ping .. 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. If there's a relevant man section please point it out. Thanks for reading, bob prohaska