I've recently upgraded from 11.2-11.3 and am trying to upgrade my jails from version 11.2p13 to 11.3p5.
I issued command within main freenas installation:
I eventually reached a point where I was presented with the following:
when I hit Enter however - I was presented with a blank screen where there was actually nothing to edit.
I hit :q to simply quit and proceeded and continued to receive similar warnings regarding other files such as /etc/group, /etc/hosts, /etc/mail/mailer.conf, /etc/master.passwd, /etc/passwd, /etc/pkg/FreeBSD.conf, /etc/shells, /etc/ssh/sshd_config, /etc/sysctl.conf,
I eventually received a confirmation screen regarding freebsd-update.conf
I'm not an expert in diff/merge operations, however this would appear to me its adding nothing and subtracting the contents of the old file? I stopped since I really didn't want to delete settings.
Can someone confirm this notation and make a recommendation what exactly to do with these conflicting files?
I issued command within main freenas installation:
Code:
iocage upgrade -r 11.3-RELEASE <jailname>
I eventually reached a point where I was presented with the following:
Code:
The following file could not be merged automatically: /etc/freebsd-update.conf Press Enter to edit this file in /usr/bin/vi and resolve the conflicts manually...
when I hit Enter however - I was presented with a blank screen where there was actually nothing to edit.
I hit :q to simply quit and proceeded and continued to receive similar warnings regarding other files such as /etc/group, /etc/hosts, /etc/mail/mailer.conf, /etc/master.passwd, /etc/passwd, /etc/pkg/FreeBSD.conf, /etc/shells, /etc/ssh/sshd_config, /etc/sysctl.conf,
I eventually received a confirmation screen regarding freebsd-update.conf
Code:
The following changes, which occurred between FreeBSD 11.2-RELEASE and FreeBSD 11.3-RELEASE have been merged into /etc/freebsd-update.conf: --- current version +++ new version @@ -1,76 +0,0 @@ -# $FreeBSD: releng/11.2/etc/freebsd-update.conf 257694 2013-11-05 09:30:06Z glebius $ - -# Trusted keyprint. Changing this is a Bad Idea unless you've received -# a PGP-signed email from <security-officer@FreeBSD.org> telling you to -# change it and explaining why. -KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5 - -# Server or server pool from which to fetch updates. You can change -# this to point at a specific server if you want, but in most cases -# using a "nearby" server won't provide a measurable improvement in -# performance. -ServerName update.FreeBSD.org - -# Components of the base system which should be kept updated. -Components src world - -# Example for updating the userland and the kernel source code only: -# Components src/base src/sys world - -# Paths which start with anything matching an entry in an IgnorePaths -# statement will be ignored. -IgnorePaths - -# Paths which start with anything matching an entry in an IDSIgnorePaths -# statement will be ignored by "freebsd-update IDS". -IDSIgnorePaths /usr/share/man/cat -IDSIgnorePaths /usr/share/man/whatis -IDSIgnorePaths /var/db/locate.database -IDSIgnorePaths /var/log - -# Paths which start with anything matching an entry in an UpdateIfUnmodified -# statement will only be updated if the contents of the file have not been -# modified by the user (unless changes are merged; see below). -UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile - -# When upgrading to a new FreeBSD release, files which match MergeChanges -# will have any local changes merged into the version from the new release. -MergeChanges /etc/ /boot/device.hints - -### Default configuration options: - -# Directory in which to store downloaded updates and temporary -# files used by FreeBSD Update. -# WorkDir /var/db/freebsd-update - -# Destination to send output of "freebsd-update cron" if an error -# occurs or updates have been downloaded. -# MailTo root - -# Is FreeBSD Update allowed to create new files? -# AllowAdd yes - -# Is FreeBSD Update allowed to delete files? -# AllowDelete yes - -# If the user has modified file ownership, permissions, or flags, should -# FreeBSD Update retain this modified metadata when installing a new version -# of that file? -# KeepModifiedMetadata yes - -# When upgrading between releases, should the list of Components be -# read strictly (StrictComponents yes) or merely as a list of components -# which *might* be installed of which FreeBSD Update should figure out -# which actually are installed and upgrade those (StrictComponents no)? -# StrictComponents no - -# When installing a new kernel perform a backup of the old one first -# so it is possible to boot the old kernel in case of problems. -# BackupKernel yes - -# If BackupKernel is enabled, the backup kernel is saved to this -# directory. -# BackupKernelDir /boot/kernel.old - -# When backing up a kernel also back up debug symbol files? -# BackupKernelSymbolFiles no Does this look reasonable (y/n)?
I'm not an expert in diff/merge operations, however this would appear to me its adding nothing and subtracting the contents of the old file? I stopped since I really didn't want to delete settings.
Can someone confirm this notation and make a recommendation what exactly to do with these conflicting files?
