Using etcupdate resolve, was Re: Surprise null root password
- Reply: Patrick M. Hausen: "Re: Using etcupdate resolve, was Re: Surprise null root password"
- Reply: Dimitry Andric : "Re: Using etcupdate resolve, was Re: Surprise null root password"
- In reply to: Mark Millard : "Re: Surprise null root password"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 15 Jun 2023 17:26:48 UTC
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