Solved Conflicts remain from previous update, aborting Error trying to upgrade my system.

ZioMario

ZioMario

Hi all,

I've upgraded FreeBSD from 13 RELEASE to 14 CURRENT using the following commands :

Code: 
# cd /usr
# mv src src-old
# git clone https://git.FreeBSD.org/src.git /usr/src OR git pull
# cd /usr/src
# make -j4 buildworld
# make -j4 kernel
# shutdown -r now
# etcupdate -p
# cd /usr/src
# make installworld
# etcupdate -B
# shutdown -r now
# pkg delete drm-kmod drm-fbsd13-kmod gpu-firmware-kmod
# cd /usr/ports/
# git pull
# cd graphics/drm-devel-kmod
# make install
# make clean
# cd ../gpu-firmware-kmod
# make install
# make clean

Unfortunately the command etcupdate -p and -B never worked for me. Everytime I issue them,I get the error : "Conflicts remain from previous update, aborting." ;

grahamperrin told me : "Are you OK with vi as the default editor? vi might appear as part of an etcupdate resolve routine" :

I hate vi. I prefer nano :D ; But I can use vi occasionally. So,if it is needed to make the script "etcupdate" to work correctly,I can use it for this task. But when the script has updated correctly the components that it wants to update,I want to come back to nano. What command should I issue to switch from nano to vi and viceversa ? thanks.
 
ok. I have issued the command "etcupdate -p and -B" from the single user mode,but I've got the same error.
 
etcupdate(8)
Resolve Mode
The resolve mode is used to resolve any conflicts encountered during a
merge. In this mode, etcupdate iterates over any existing conflicts
prompting the user for actions to take on each conflicted file. For each
file, the following actions are available:

(p) postpone Ignore this conflict for now.
(df) diff-full Show all changes made to the merged file as a unified
diff.
(e) edit Change the merged file in an editor.
(r) resolved Install the merged version of the file into the desti-
nation directory.
(mf) mine-full Use the version of the file in the destination direc-
tory and ignore any changes made to the file in the
"current" tree.
(tf) theirs-full Use the version of the file from the "current" tree and
discard any local changes made to the file.
(h) help Display the list of commands.
Click to expand...
 
eternal_noob said:
… single user mode …
Click to expand...

Habit more than necessity, for installworld (not for etcupdate).

FYI, but please don't reply here:

forums.freebsd.org

make installworld and single-user mode

When it comes to make installworld this should be done in single-user mode. In Absolute FreeBSD 2nd Ed. (M.W.Lucas 2008, p. 395f.) can be read some lowlevel changes in the system require the install in the single-user mode. I’d like to ask what these lowlevel changes might be and when they...
forums.freebsd.org forums.freebsd.org
 
ziomario said:
I suppose that "resolve those merge conflicts" would require a lot of knowledge ?
Click to expand...

I'm always confused by the presence of lines such as these:

======= >>>>>>> new <<<<<<< original ======= >>>>>>> new

An example:

1643338975469.png
 
Code: 
root@marietto:/usr/home/marietto # etcupdate resolv

usage: etcupdate [-npBF] [-d workdir] [-r | -s source | -t tarball]
[-A patterns] [-D destdir] [-I patterns] [-L logfile]
[-M options]
etcupdate build [-B] [-d workdir] [-s source] [-L logfile] [-M options]
<tarball>
etcupdate diff [-d workdir] [-D destdir] [-I patterns] [-L logfile]
etcupdate extract [-B] [-d workdir] [-s source | -t tarball]
[-D destdir] [-L logfile] [-M options]
etcupdate resolve [-p] [-d workdir] [-D destdir] [-L logfile]
etcupdate revert [-d workdir] [-D destdir] [-L logfile] file ...
etcupdate status [-d workdir] [-D destdir]
 
ohhh finally you gave me some useful informations in a different shape than the man pages and that shape is tolerated by my mind.

PS : it does not seems to be strictly related to FreeBSD...
 
VladiBG said:
You can find the default workdir and destdir in the manual of etcupdate(8) look for -D and -d flags. When you don't specify them the defaults are applied.
Click to expand...

you didn't understand my difficults to grab informations from the FreeBSD man pages and use them in a effective way. They are exposed in a way that's totally rejected by my attention. Maybe there are too much informations compressed in a little of space and I'm not able to filter what I really need. So I will not read there.
 
I'm not understanding anything. Anyway,currently I'm running 14.0 CURRENT even if when I have issued the etcupdate commands,I got the error messages. What's missing in my system if those commands are failed,but the system ran correctly ? or at least,it seems. what about if I remove the src folder and I get a fresh copy of the source code giving a "git clone https://git.FreeBSD.org/src.git /usr/src" ? Is this a correct behavior to overcome the errors ?
 
ziomario easy, tiger :-)

IMHO this is a slightly grey area.

Problems with etcupdate can bug 13.0-STABLE, which is supported here, as much as they bug 14.0-CURRENT. The first example that comes to mind is jbodenmann,

forums.freebsd.org

Solved - Update from source: etcupdate -B fails

I've just compiled world & kernel from the latest stable/13 branch. I've done this several times over the last two months and didn't run into any issues following the procedure outlined by the handbook. This time however, running etcupdate -B fails: Conflicts remain from previous update...
forums.freebsd.org forums.freebsd.org
 
You must log in or register to reply here.
Back
Top