Could someone please explain how to use freebsd-update upgrade without destroying all of your configuration files? I really don?t understand how to use the merge function.. In this case i typed :q for all files it asked about. :wq seem to do about the same thing. Notice that a few of the files has this shit in multiple places. I can?t be right that I should edit every file manually and look for ?current version? and so on? # grep "<< current" * crontab:<<<<<<< current version dhclient.conf:<<<<<<< current version group:<<<<<<< current version hosts:<<<<<<< current version inetd.conf:<<<<<<< current version master.passwd:<<<<<<< current version motd:<<<<<<< current version ntp.conf:<<<<<<< current version passwd:<<<<<<< current version services:<<<<<<< current version shells:<<<<<<< current version snmpd.config:<<<<<<< current version syslog.conf:<<<<<<< current version syslog.conf:<<<<<<< current version ttys:<<<<<<< current version ttys:<<<<<<< current version # grep "<< current" */* mail/freebsd.cf:<<<<<<< current version mail/freebsd.cf:<<<<<<< current version mail/freebsd.cf:<<<<<<< current version mail/freebsd.submit.cf:<<<<<<< current version mail/freebsd.submit.cf:<<<<<<< current version mail/freebsd.submit.cf:<<<<<<< current version mail/sendmail.cf:<<<<<<< current version mail/sendmail.cf:<<<<<<< current version mail/sendmail.cf:<<<<<<< current version mail/submit.cf:<<<<<<< current version mail/submit.cf:<<<<<<< current version mail/submit.cf:<<<<<<< current version ssh/sshd_config:<<<<<<< current version ssh/sshd_config:<<<<<<< current version -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 3738 bytes Desc: S/MIME Cryptographic Signature URL: <http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20141105/45694ac2/attachment.bin>
On Wed, Nov 5, 2014 at 8:30 AM, Peter Ankerst?l <peter at pean.org> wrote:> Could someone please explain how to use freebsd-update upgrade without > destroying all of your configuration files? > > I really don't understand how to use the merge function.. In this case i > typed :q for all files it asked about. :wq seem to > do about the same thing. Notice that a few of the files has this shit in > multiple places. I can't be right that I should edit every file manually and > look for "current version" and so on? >Most likely what happened is that when you used :wq it wrote the contents of the diff between your current version and the new version to your existing configuration files. If you had stuck to using :q, it should have left your existing configuration files alone.