Solved Problem with upgrading from 13 to 14

kerogaz said:
But after ENTER I cant write :wq in uptater's vi, that's why I use nano.
In previous releases I simply did :q and the installation proceeded without problems.And now neither :q nor :wq after editing ,will let me continue upgrade
Click to expand...
Do not exit the editor with :q this will leave unresolved merge of the file with all markers in it.

Learn how to use vi(1)

/text = search for "text" ("n" search forward next match)
dd = Delete the line the cursor is on
x = Delete the character the cursor is on
i = insert new text, before the cursor
Esc = quit entering text
:w = write
:q = quit
:q! = quit do not save
:wq = write+quit
Click to expand...

When manually resolving a conflicting merge you need to decide which data you want to keep. Usually this is the new version bellow the === row. For this you need to delete all rows starting after the <<< row until you reach === and after you delete this section you need to go back and remove the <<< row then === row and finally the >>> row. Repeat this for every section in the file until there's no more rows starting with <<<;===;>>>

<<< current
1old data
2old data
===
1new data
2new data
>>> new version
Click to expand...

First remove the first section between <<< and === rows so the file look like this

<<< current
===
1new data
2new data
>>> new version
Click to expand...

Then remove the marker rows <<<;===;>>> and the end result look like this and save the file :w and quit :q

1new data
2new data
Click to expand...

In your original file there's a lot of older not resolved conflicts which need to be removed entirely in /var/db/freebsd-update/merge/new//etc/mail/mailer.conf . Unresolved conflict will be keep in /var/db/freebsd-update/merge until it's installed during the freebsd-update install
 
Code: 
Press Enter to edit this file in vi and resolve the conflicts
manually...


<<<<<<< current version


=======
>>>>>>> 14.0-RELEASE
#
# mailer.conf for use with dma(8)
#
<<<<<<< current version
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail        /usr/libexec/dma
mailq           /usr/libexec/dma
newaliases      /usr/libexec/dma


=======
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail        /usr/libexec/dma
mailq           /usr/libexec/dma
newaliases      /usr/libexec/dma
>>>>>>> 14.0-RELEASE
~
~
~
~
~
~
~
~
~
~
~
/var/db/freebsd-update/merge/new//etc/mail/mailer.conf: unmodified: line 1
What needs to be removed?
 
Leave this:
Code: 
#
# mailer.conf for use with dma(8)
#
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
And remove everything else. Then save and quit the editor.
 
<<<<<<< current version


=======
>>>>>>> 14.0-RELEASE
#
# mailer.conf for use with dma(8)
#
<<<<<<< current version
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma


=======
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
>>>>>>> 14.0-RELEASE
Click to expand...
At the end it should look like this:

#
# mailer.conf for use with dma(8)
#
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
Click to expand...
 
after :w
#
# mailer.conf for use with dma(8)
#
<<<<<<< current version
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma

~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
/var/db/freebsd-update/merge/new//etc/mail/mailer.conf: 11 lines, 293 characters.
 
after
:q

Merge conflict markers remain in: /etc/mail/mailer.conf
These must be resolved for the system to be functional.

Press Enter to return to editing this file.
 
after Enter
#
# mailer.conf for use with dma(8)
#
<<<<<<< current version
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma

~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
var/db/freebsd-update/merge/new//etc/mail/mailer.conf: unmodified: line 1

~
 
VladiBG said:
what is in your /etc/mail/mailer.conf right now?
Click to expand...

#
# mailer.conf for use with dma(8)
#
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
 
According your post 30 you didn't remove all <<<|===|>>> rows before you write the file. Just resolve the conflict by removing those lines and save the file again.
 
The following file could not be merged automatically: /etc/mail/mailer.conf
Press Enter to edit this file in vi and resolve the conflicts
manually
Press enter:
<<<<<<< current version


=======
>>>>>>> 14.0-RELEASE
#
# mailer.conf for use with dma(8)
#
<<<<<<< current version
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma


=======
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
/var/db/freebsd-update/merge/new//etc/mail/mailer.conf: unmodified: line 1

After edit:
#
# mailer.conf for use with dma(8)
#
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~

:w
#
# mailer.conf for use with dma(8)
#
# If sendmail is configured, an example of mailer.conf that uses sendmail
# instead can be found in /usr/share/examples/sendmail.

sendmail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
/var/db/freebsd-update/merge/new//etc/mail/mailer.conf: 9 lines, 268 characters.
:q
The following file could not be merged automatically: /etc/master.passwd
Press Enter to edit this file in vi and resolve the conflicts
manually..
Press enter
<<<<<<< current version
# $FreeBSD$
#
root:$6$zKIT05Fk.XtupHAZ$i4ffevnJQqyCNOwiotCqDdV2ZTVM4fgrwqQ5vEbFhpAttecjh825z3nsUI3tDMAZKh.xERbjlyN9AH/DdLA8e0:0:0
::0:0:Charlie &:/root:/bin/tcsh
=======
root::0:0::0:0:Charlie &:/root:/bin/sh
>>>>>>> 14.0-RELEASE
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin
news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin
man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
proxy:*:62:62::0:0:packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
_pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin
/var/db/freebsd-update/merge/new//etc/master.passwd: unmodified: line 1
:q
:q

Merge conflict markers remain in: /etc/master.passwd
These must be resolved for the system to be functional.

Press Enter to return to editing this file.
 
Code: 
<pre>ress Enter to return to editing this file.


&lt;&lt;&lt;&lt;&lt;&lt;&lt; current version
# $FreeBSD$
#
root:$6$zKIT05Fk.XtupHAZ$i4ffevnJQqyCNOwiotCqDdV2ZTVM4fgrwqQ5vEbFhpAttecjh825z3nsUI3tDMAZKh.xERbjlyN9AH/DdLA8e0:0:0
::0:0:Charlie &amp;:/root:/bin/tcsh
=======
root::0:0::0:0:Charlie &amp;:/root:/bin/sh
&gt;&gt;&gt;&gt;&gt;&gt;&gt; 14.0-RELEASE
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &amp;:/:/usr/sbin/nologin
bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
_pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin
_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin
uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin
www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
ntpd:*:123:123::0:0:NTP Daemon:/var/db/ntp:/usr/sbin/nologin
_ypldap:*:160:160::0:0:YP LDAP unprivileged user:/var/empty:/usr/sbin/nologin
hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin
tests:*:977:977::0:0:Unprivileged user for tests:/nonexistent:/usr/sbin/nologin
nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
mysql:*:88:88::0:0:MySQL Daemon:/var/db/mysql:/usr/sbin/nologin
postfix:*:125:125::0:0:Postfix Mail System:/var/spool/postfix:/usr/sbin/nologin
dovecot:*:143:143::0:0:Dovecot User:/var/empty:/usr/sbin/nologin
_tss:*:601:601:daemon:0:0:TrouSerS user:/var/empty:/usr/sbin/nologin
pal:$6$CAO4AZrXge7WRz48$gKcpPv7kwFWk9iRHUbTyR5eGLJNyWtefqDugt5Y7oG0FlEje1ONa1nxfEDuAagptVFavrTcE7Trd/b8zch2qq/:1006
</pre>
 
remove all <<<|===|>>> rows
The following file could not be merged automatically: /etc/ntp.conf
Press Enter to edit this file in vi and resolve the conflicts
manually...


#
#
# Default NTP servers for the FreeBSD operating system.
#
# Don't forget to enable ntpd in /etc/rc.conf with:
# ntpd_enable="YES"
#
# The driftfile is by default /var/db/ntpd.drift, check
# /etc/defaults/rc.conf on how to change the location.
#

#
# Set the target and limit for adding servers configured via pool statements
# or discovered dynamically via mechanisms such as broadcast and manycast.
# Ntpd automatically adds maxclock-1 servers from configured pools, and may
# add as many as maxclock*2 if necessary to ensure that at least minclock
# servers are providing good consistent time.
#
tos minclock 3 maxclock 6

#
# The following pool statements will give you a random set of IPv4 and IPv6
# NTP servers geographically close to you. A single pool statement adds
# multiple servers from the pool, according to the tos minclock/maxclock
/var/db/freebsd-update/merge/new//etc/ntp.conf: unmodified: line 1
 
I was asked to correct a lot, and I did it, now I have
Code: 
The following changes, which occurred between FreeBSD 13.2-RELEASE and
FreeBSD 14.0-RELEASE have been merged into /etc/csh.cshrc:
--- current version
+++ new version
@@ -1,6 +1,5 @@
-# $FreeBSD$
 #
 # System-wide .cshrc file for csh(1).
 set prompt="%{^[[40;33;1m%}[%T] %{^[[40;32;1m%} %/ >"
 set savehist = (8192 merge)
 set savedirs = 100
Does this look reasonable (y/n)?
Take a chance and press yes?
 
I took a risk. Reached "To install the downloaded upgrades, run "/usr/sbin/freebsd-update install".
Reboot
now
freebsd-update install
Installing updates...
 
Now its all right. Thanks for all.
I had to remove it in many places all <<<|===|>>> rows



Code: 
freebsd-update install
Installing updates...rm: ///usr/src/contrib/llvm-project/libcxx/include/__string: is a directory
rm: ///usr/include/c++/v1/__string: is a directory

Restarting sshd after upgrade
Performing sanity check on sshd configuration.
Stopping sshd.
Waiting for PIDS: 3674.
Performing sanity check on sshd configuration.
Starting sshd.
Scanning /usr/share/certs/untrusted for certificates...
Scanning /usr/share/certs/trusted for certificates...
Scanning /usr/local/share/certs for certificates...

Completing this upgrade requires removing old shared object files.
Please rebuild all installed 3rd party software (e.g., programs
installed from the ports tree) and then run "/usr/sbin/freebsd-update install"
again to finish installing updates.
[1] 45840
root@host:/usr/local/etc # freebsd-version
14.0-RELEASE
 
kerogaz said:
Code: 
The following changes, which occurred between FreeBSD 13.2-RELEASE and
FreeBSD 14.0-RELEASE have been merged into /etc/csh.cshrc:
--- current version
+++ new version
@@ -1,6 +1,5 @@
-# $FreeBSD$
 #
 # System-wide .cshrc file for csh(1).
 set prompt="%{^[[40;33;1m%}[%T] %{^[[40;32;1m%} %/ >"
 set savehist = (8192 merge)
 set savedirs = 100
Does this look reasonable (y/n)?
Take a chance and press yes?
Click to expand...

Yes, this is an example of an automatic merge: a line was removed but the installer still asked for confirmation. Other merges are safer and don't need confirmation. Other (as you just discovered) are too complex to be done automatically and you must handle them manually.
 
master.passwd file keep the old information from the current section and change only the csh to sh. Remove the empty root account from the 14.0-RELEASE

<<<<< current version
# $FreeBSD$
#
root:$6$************************************************0:0:0
::0:0:Charlie &amp;:/root:/bin/tcsh
=======
root::0:0::0:0:Charlie &amp;:/root:/bin/sh
>>>>>>14.0-RELEASE
 
You must log in or register to reply here.
Back
Top