Date: Thu, 15 Jun 2023 10:26:48 -0700 From: bob prohaska <fbsd@www.zefox.net> To: Current FreeBSD <freebsd-current@freebsd.org> Cc: bob prohaska <fbsd@www.zefox.net> Subject: Using etcupdate resolve, was Re: Surprise null root password Message-ID: <ZItJ2GFmBhFgA2Uy@www.zefox.net> In-Reply-To: <C221AC0B-7DF3-4FC2-BE9F-BC136BEC4B9A@yahoo.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZItJ2GFmBhFgA2Uy>