Re: Using etcupdate resolve, was Re: Surprise null root password

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