Merging files

H

HelpUpdate

I have no clue what to do please help.. updating to 14.3 It put me in VI, what am I meant to change. ""the following file could not be merged automatically: /etc/group""
1111.jpg
2222.jpg
 
i ran etcupdate but it didnt do anything so
When I got the prompt to "merge" I just followed this
SirDice

Post in thread '14.0-RELEASE Upgrade question: Merge conflict markers remain'

bugzeo said:
How do I fix this?
Click to expand...

Code: 
<<<<<<< current version         <-- REMOVE
# $FreeBSD$                      <-- REMOVE
#                             <-- REMOVE
wheel:*:0:root,user               <-- KEEP!
=======                   <-- REMOVE
wheel:*:0:root             <-- REMOVE
>>>>>>> 14.0-RELEASE    <-- REMOVE
daemon:*:1:
kmem:*:2:
And a little further down:

Code: 
mailnull:*:26:
guest:*:31:
<<<<<<< current version    <-- REMOVE
video:*:44:user,lightdm             <-- KEEP!
=======              <-- REMOVE
video:*:44:               <--- REMOVE
realtime:*:47:           <--- KEEP...
  • Thanks
  • Like
But I didnt delete video:44 because I did not have the other "Video" like he did.

After that I got the same thing but for /etc/master.passwd, i saw another old suggestion to delete a few lines so I did..
and then it told me to /usr/sbin/freebsd-update install, So I did and then it told me to reboot and do it again which I did, and I was in 14.3 now it said.
And then it told me that "install: ///usr/include/c++/v1/__string: No such file or directory", or it said that it was a file but not a directory I forgot. also the same thing but with "__tuple" at the end. so I did what this post said https://forums.freebsd.org/threads/update-path-with-poudriere-packages.99687/post-722898 there were two other files that had a simular message but i figured it would show up again when I rebooted it and ran the install again but It didnt.

Its updating again and it says "removing conflicting directory ///usr/src/sys/contrib/openzfs/cmd/arc_summary"
and
"removing conflicting directory ///usr/src/sys/contrib/openzfs/cmd/zvol_wait"

its been running overnight and the update hasnt completed so I assume its stuck, I assumed it was stuck the last time which is why I did that previous thing.
 
Bot or human? You never know these days...

So what's the question, exactly?

Do you know how to use vi?

Merging files during an upgrade is straightforward. The script compares your files with the stock files it has downloaded and when it finds a difference (which is a given for user/group-related files) it will show you the merged result, that is, both your file and the new file on top of each other.

When not in "insert mode", type "dd" to delete the lines you don't want: anything that looks like a comment, as well as any duplicate of your lines. For example, you delete the stock root user with no password and keep your own root user with the encrypted/salted password.
Then you save the file with "wq".

As for the group file, most of these users and groups are recreated when reinstalling ports/packages.
 
To add to Beastie's excellent post: (a) You will need to know at least the basics of operating vi. It might be possible to switch to different editors, but since at least survival skills in vi are vital (pun!), you might as well get on that with.

(b) You understand how the merged file shows you the sections where the automatic merge detected a conflict? It uses this format:
Code: 
<<<<<<<< Name of one version here
The content of
the one version
========
The content of the
other version which
caused a conflict
>>>>>>>> Name of the other version

Your task (should you choose to accept it) is to remove the <<<, === and >>> markers, and select from the two versions of the content the one that is correct. If you fail and leave the <<<... markers, the resulting file will not work, as these lines are pretty much guaranteed to be in an invalid format.

In your particular case, it seems that someone (probably you) added the user "aaa" to the wheel group. I assume you want to keep that after the update too. It also seems that one version has a comment that says "FreeBSD"; you should figure out whether that comment is from the new version (which comes from the upgrade), in which case you should probably keep it in the resulting file. Why? Because then the next upgrade won't complain that the comment vanished again, and not include it in the merge.
 
You must log in or register to reply here.
Back
Top