upgrade to 14.0-BETA1 and /etc/group

E

Elimelech

Code: 
root@F3ja:/usr/home/luba # freebsd-update upgrade -r 14.0-BETA1
src component not installed, skipped
Looking up update.FreeBSD.org mirrors... 2 mirrors found.
Fetching metadata signature for 13.2-RELEASE from update2.freebsd.org... done.
Fetching metadata index... done.
Fetching 1 metadata patches. done.
Applying metadata patches... done.
Fetching 1 metadata files... done.
Inspecting system... done.

The following components of FreeBSD seem to be installed:
kernel/generic kernel/generic-dbg world/base world/lib32

The following components of FreeBSD do not seem to be installed:
world/base-dbg world/lib32-dbg

Does this look reasonable (y/n)? y

Fetching metadata signature for 14.0-BETA1 from update2.freebsd.org... done.
Fetching metadata index... done.
Fetching 1 metadata patches. done.
Applying metadata patches... done.
Fetching 1 metadata files... done.
Inspecting system... done.
Fetching files from 13.2-RELEASE for merging... done.
Preparing to download files... done.
Attempting to automatically merge changes in files... done.

The following file could not be merged automatically: /etc/group
Press Enter to edit this file in vi and resolve the conflicts
manually...



Code: 
<<<<<<< current version
# $FreeBSD$
#
wheel:*:0:root,luba
=======
wheel:*:0:root
>>>>>>> 14.0-BETA1

Why the conflict? Should I remove the user 'luba' from the 'wheel' group and for what?
 
You did not understand me. If I leave the line wheel:*:0:root,luba, that is, the luba user, then the installation stops.
 
The installers told me to remove the user from the Wheel group. This is the first time in many years that an installer has done this. Kind of weird. Why remove him from this group?
 
Not installer, rather freebsd-update, and the change here was removing the $FreeBSD$ IDs from the entire tree. Why it couldn't resolve this automatically - you have the root line modified, but that does not mean freebsd-upgrade does not "like" it and wants you to remove user; you just need to resolve this yourself by removing everything before that line, keeping your user in there, and marking the conflict as resolved (it really is just a 3way diff).
 
yuripv79 said:
Not installer, rather freebsd-update, and the change here was removing the $FreeBSD$ IDs from the entire tree. Why it couldn't resolve this automatically - you have the root line modified, but that does not mean freebsd-upgrade does not "like" it and wants you to remove user; you just need to resolve this yourself by removing everything before that line, keeping your user in there, and marking the conflict as resolved (it really is just a 3way diff).
Click to expand...
Removed the $FreeBSD$ identifier. Nothing has changed:​
Code: 
<<<<<<< current version
wheel:*:0:root,luba
=======
wheel:*:0:root
>>>>>>> 14.0-BETA1

​
 
Elimelech said:
<<<<<<< current version wheel:*:0:root,luba ======= wheel:*:0:root >>>>>>> 14.0-BETA1
Click to expand...
Leave only:
Code: 
wheel:*:0:root,luba
That's how you resolve these kinds of diffs, removing the markers (<<<, ===, >>>) and leaving only the correct part.

What's going here (more verbose) is:
1. The version you are upgrading from had that file that looked like the following:
Code: 
# $FreeBSD$
wheel:*:0:root
2. The version you are upgrading to has it as:
Code: 
wheel:*:0:root
3. Your current modified file is:
Code: 
# $FreeBSD$
wheel:*:0:root,luba

The diff/merge tool is unsure what to with it so it asks you to resolve the conflict and make it look correct.
 
You must log in or register to reply here.
Back
Top