Today I got stuck upgrading my server from FreeBSD 13 to 14.
With no way to skip, resume, cancel, nor return. I have spotted the new U2F entry and accepted this addition, but cannot find any remaining differences.
Code:
# freebsd-version -kru
13.2-RELEASE
13.2-RELEASE-p4
13.2-RELEASE
# freebsd-update fetch install
The following files will be added as part of updating to 13.2-RELEASE-p8:
…
done.
# pkg update && pkg upgrade
Checking integrity... done (0 conflicting)
Your packages are up to date.
# freebsd-update -r 14.0-RELEASE upgrade
…
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...
… (After alignment) …
<<<<<<< current version
=======
>>>>>>> 14.0-RELEASE
wheel:*:0:root
daemon:*:1:
kmem:*:2:
sys:*:3:
tty:*:4:
…
network:*:69:
audit:*:77:
<<<<<<< current version
www:*:80:
u2f:*:116:
=======
www:*:80:
u2f:*:116:
>>>>>>> 14.0-RELEASE
ntpd:*:123:
_ypldap:*:160:
hast:*:845:
tests:*:977:
…
Merge conflict markers remain in: /etc/group
These must be resolved for the system to be functional.
Press Enter to return to editing this file.With no way to skip, resume, cancel, nor return. I have spotted the new U2F entry and accepted this addition, but cannot find any remaining differences.