Solved Problem with upgrading from 13 to 14

kerogaz

kerogaz

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

Code: 
<<<<<<< current version
<<<<<<< current version
<<<<<<< current version
<<<<<<< current version
<<<<<<< current version
<<<<<<< current version
<<<<<<< current version

<<<<<<< current version
<<<<<<< current version
<<<<<<< current version
=======
# $FreeBSD: releng/10.2/etc/mail/mailer.conf 93858 2002-04-05 04:25:14Z gshapiro $
>>>>>>> 10.2-RELEASE
=======
# $FreeBSD: releng/10.3/etc/mail/mailer.conf 93858 2002-04-05 04:25:14Z gshapiro $
>>>>>>> 10.3-RELEASE
=======
# $FreeBSD: releng/11.0/etc/mail/mailer.conf 93858 2002-04-05 04:25:14Z gshapiro $
>>>>>>> 11.0-RELEASE
=======
# $FreeBSD: releng/11.1/etc/mail/mailer.conf 93858 2002-04-05 04:25:14Z gshapiro $
>>>>>>> 11.1-RELEASE
=======
/var/db/freebsd-update/merge/new//etc/mail/mailer.conf: unmodified: line 1
etc etc
# If dma(8) is installed, an example mailer.conf that uses dma(8) instead can
# can be found in /usr/share/examples/dma.
>>>>>>> 12.2-RELEASE
#
<<<<<<< current version
sendmail        /usr/local/sbin/sendmail
send-mail       /usr/local/sbin/sendmail
mailq           /usr/local/sbin/sendmail
newaliases      /usr/local/sbin/sendmail
=======
sendmail        /usr/libexec/sendmail/sendmail
mailq           /usr/libexec/sendmail/sendmail
newaliases      /usr/libexec/sendmail/sendmail
hoststat        /usr/libexec/sendmail/sendmail
purgestat       /usr/libexec/sendmail/sendmail
>>>>>>> 11.2-RELEASE
=======
# 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
#
<<<<<<< current version
<<<<<<< current version
# Execute the Postfix sendmail program, named /usr/local/sbin/sendmail
=======
# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
=======
# mailer.conf for use with dma(8)
>>>>>>> 14.0-RELEASE
/var/db/freebsd-update/merge/new//etc/mail/mailer.conf: unmodified: line 1
 
What can I do now.?I stopped at this upgrade step and can't go any further.I can neither skip this step nor make any changes in vi
 
Code: 
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.
What exactly needs to be edited and how? I press enter and it launches vi but the editor doesn't work
 
I inserted

Code: 
  # Execute dma instead of sendmail
         sendmail         /usr/libexec/dma
         mailq         /usr/libexec/dma
         newaliases         /usr/libexec/dma
         rmail         /usr/libexec/dma
recorded :wq
But again the same message
Code: 
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.
 
The editor of freebsd-update can be changed with the environment variable EDITOR.
env EDITOR=/usr/bin/ee freebsd-update ...

The default in mailer.conf is in /usr/share/examples/dma/mailer.conf.
src/libexec/dma/dmagent/mailer.conf.
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
 
Control-Alt-F3 to present a login prompt at a separate console.

Login as root, then run this command:

echo $SHELL

This will show which shell is currently preferred by the root user.

Let us know the shell, then we can more certainly advise on how to proceed.

If it helps: you have my empathy. I have suffered the pain of vi too often.
 
kerogaz said:
I inserted

Code: 
  # Execute dma instead of sendmail
         sendmail         /usr/libexec/dma
         mailq         /usr/libexec/dma
         newaliases         /usr/libexec/dma
         rmail         /usr/libexec/dma
recorded :wq
But again the same message
Code: 
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.
Click to expand...

Maybe you left other conflict markers around? Looking at your first message you have lots of them from previous upgrades:

Code: 
<<<<<<< current version
[...]
=======
[...]
>>>>>>> NN.M-RELEASE
 
After changing mailer.conf after ENTER the same

Code: 
=======
>>>>>>> 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
 
Code: 
nano /var/db/freebsd-update/merge/new//etc/mail/mailer.conf


Code: 
<<<<<<< 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
 
fix the conflict manually then remove the conflict markers: (like ">>>>>>>> 14.0-RELEASE" and "<<<<<<<<<<< current version"
then save and exit from editor
 
Did not help:
Code: 
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...


<<<<<<< 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
<<<<<<< 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
~
~
~
~
~
~
~
~
 
Code: 
=======
>>>>>>> 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
 
Lesson not learned!
forums.freebsd.org

What is it?

Udating /var/run/os-release done. Creating and/or trimming log filesnewsyslog:error in config file;bad permissions
forums.freebsd.org forums.freebsd.org
forums.freebsd.org

What to do with the message that appears after a system upgrade

freebsd-update fetch 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. Inspecting system... done. Preparing to download files... done. The following files are affected by...
forums.freebsd.org forums.freebsd.org
forums.freebsd.org

Lost log file

After upgrading syslog: /var/log/daemon.log:No such file or ... What can I do?
forums.freebsd.org forums.freebsd.org
Good luck.
 
You didn't remove conflicts. Upgrading procedure tried to merge updated file with old ones but some of them need manual intervention.

Code: 
<<<<<<< current version
# This is what you have now in your file.
Foo
=======
# This is what the update needs
Bar
>>>>>>> 13.2-RELEASE


You must replace all the lines above with:

Code: 
Foo

or with:

Code: 
Bar

or with:

Code: 
Foo Bar

Or something else.
 
I have already removed all links to previous versions in sudo nano
/etc/mail/mailer.conf

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
 
But it did not help. Or is it a bug or an updater somewhere in another place takes configs or from some kind of cache
 
I reload system . In vain
Code: 
<<<<<<< current version


=======
>>>>>>> 14.0-RELEASE
#
<<<<<<< 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
It’s unclear why he doesn’t like the first line
 
Aminavy said:
when message appeared press enter and edit the file.
you are used nano to edit?
Click to expand...
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
 
I see that the updater reads the configs somehow strangely. It adds some lines different from the contents of the config and then reports their errors
 
You must log in or register to reply here.
Back
Top