Date: Wed, 28 Aug 2019 17:42:51 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 240177] sysutils/iocage: [patch] Fix `iocage upgrade` (to 11.3-RELEASE and future 12.x releases) Message-ID: <bug-240177-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D240177 Bug ID: 240177 Summary: sysutils/iocage: [patch] Fix `iocage upgrade` (to 11.3-RELEASE and future 12.x releases) Product: Ports & Packages Version: Latest Hardware: Any URL: https://github.com/iocage/iocage/pull/1027 OS: Any Status: New Severity: Affects Some People Priority: --- Component: Individual Port(s) Assignee: araujo@FreeBSD.org Reporter: grembo@FreeBSD.org Assignee: araujo@FreeBSD.org Flags: maintainer-feedback?(araujo@FreeBSD.org) Flags: merge-quarterly? Created attachment 206984 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D206984&action= =3Dedit Fix iocage upgrade - patch This addresses a couple problems that prevented `iocage upgrade' from worki= ng properly. 1. Bug #229346 changed freebsd-update to exit with status code 1 in case of= no more updates are available. This fixed ezjail and iocell, but broke iocage.= As a result, iocage upgrade -r 11.3-RELEASE would not finish updating iocage j= ail config and exit with an error message. This happened first on 11.3-RELEASE = and will also happen on 12.1-RELEASE 2. When updating a jail to 11.x-RELEASE on a 12.x machine, merging config f= iles will create empty files (which then all end up as merge errors). As a resul= t, all configuration is lost (or the attentive sysadmin exits the process in t= ime and fixes things manually). This is caused by the fact that rcs was removed from base in 12.x. Its freebsd-update uses diff3 instead. As iocage always fetches the freebsd-update script of the target release, it gets one from 1= 1.x which will break. This was fixed by adding rcs57 as a dependency of the pac= kage (based on the existence of "merge"). 3. Upgrading multiple jails (iocage upgrade ALL -r <release>) would break, because of a workaround (setting UNAME_r in the environment) that shouldn't= be required any more (iocage 1.2RC already has it removed). I also: - bumped revision - moved NO_ARCH to pacify portlint See also: https://github.com/iocage/iocage/pull/1027 --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-240177-7788>