Date: Thu, 15 Jun 2023 19:48:54 +0200 From: "Patrick M. Hausen" <pmh@hausen.com> To: bob prohaska <fbsd@www.zefox.net> Cc: Current FreeBSD <freebsd-current@freebsd.org> Subject: Re: Using etcupdate resolve, was Re: Surprise null root password Message-ID: <D3835849-D491-4711-810B-7CE96789AEA6@hausen.com> In-Reply-To: <ZItJ2GFmBhFgA2Uy@www.zefox.net> References: <8721FE04-3769-473C-BAAD-EB0A4FCFA1D7.ref@yahoo.com> <8721FE04-3769-473C-BAAD-EB0A4FCFA1D7@yahoo.com> <ZHalP9BhpSiKvDmb@www.zefox.net> <C221AC0B-7DF3-4FC2-BE9F-BC136BEC4B9A@yahoo.com> <ZItJ2GFmBhFgA2Uy@www.zefox.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi, > Am 15.06.2023 um 19:26 schrieb bob prohaska <fbsd@www.zefox.net>: > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D3835849-D491-4711-810B-7CE96789AEA6>