Jail upgrade from 11.2-RELEASE-p15 to 11.3-release fails

Description

I updated my FreeNAS installation from 11.2-U7 to 11.3-RC1. This did work fine.

Then I tried to upgrade a jail from 11.2-RELEASE-p15 to U11.3-RELEASE. I got messages like

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...

and when continuing I was not able to login. See also

https://www.ixsystems.com/community/threads/freenas-11-3-beta-1-how-to-update-jails-from-11-2-to-11-3-release.80147/

which describes the same issue as I experienced.

Problem/Justification

None

Impact

None

SmartDraw Connector

Katalon Manual Tests (BETA)

Activity

Show:

Manfred Usselmann 
January 20, 2020 at 8:02 AM

This should be fixed for 11.3-Release, see relating issue https://jira.ixsystems.com/browse/NAS-104694.

Kevin Hilton 
January 20, 2020 at 7:17 AM
(edited)

I wish I could help debug this problem, I've posted a similar thread in the FreeNAS forums about the issue here after upgrading from 11.2U7 to 11.3 RC2 and then trying to upgrade the jails:

https://www.ixsystems.com/community/threads/trying-to-upgrade-base-freebsd-version-of-jail-having-problems-with-merge-conflicts.81596/

 

File to resolve is empty and then I believe in the end it wants to delete the contents of the file.

 

Based on reports of others who have responded.  I install pkg rcs57 on the freenas host and reran the command:

iocage upgrade -r 11.3-RELEASE nextcloud

 

Everything seemed to upgrade OK only after installing the rcs57 pkg.  

Manfred Usselmann 
January 14, 2020 at 10:42 PM

This still happens after update from 11.3 RC1 to RC2.

Bug Clerk 
January 6, 2020 at 1:39 PM

Kjeld Schouten-lebbing 
January 6, 2020 at 8:55 AM

I can confirm this behavior:
When running 11.2U7 i can upgrade jails from 11.2-RELEASE to 11.3-RELEASE perfectly fine.

However when I try the same on 11.3RC1 I get these warnings about "line conflicts".
However when resolving the conflict the file is actually empty. So it is warning about conflicts of empty files.

Complete

Details

Assignee

Reporter

Labels

Fix versions

Affects versions

Priority

More fields

Katalon Platform

Created January 1, 2020 at 4:59 PM
Updated July 1, 2022 at 4:46 PM
Resolved January 6, 2020 at 1:39 PM