I want to thank Patrick, Dmitry and Mark for providing
orientation sufficient to make some headway. The Handbook
simply says
"If etcupdate(8) is not able to merge a file automatically,
the merge conflicts can be resolved with manual interaction
by issuing:
# etcupdate resolve
While not
[Note: In this 2nd try, I've indented everything by a tab
to help avoid reinterpretation/reformatting of some of the
text.]
I'm going to comment about the notations mean, not
about that the specific type of file is not one
you would be likely to have other than sn
On 15 Jun 2023, at 19:26, bob prohaska wrote:
>
> 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,
Hi,
> Am 15.06.2023 um 19:26 schrieb bob prohaska :
> 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 >
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
---
*sigh* Attachments did not seem to make the list archive ...
On Thu, Jun 15, 2023 at 1:14 AM parv/FreeBSD wrote:
> I am stuck in "installworld" step due to
> ERROR-tried-to-rebuild-during-make-install when going
> from 1cebc9298cf to b98fbf3781 on one host, or from
> 9fbeeb6e3831 to dfa1982352ee
Hi there,
I am stuck in "installworld" step due to
ERROR-tried-to-rebuild-during-make-install when going
from 1cebc9298cf to b98fbf3781 on one host, or from
9fbeeb6e3831 to dfa1982352ee on another host.
What should I be looking for?
1cebc9298cf-to-b98fbf3781:
log:
...
install -d -m 0755 -o
