Drop the custom /etc/containers/toolbox.conf from RHEL 10 onwards

Complete support for RHEL Toolbx images based on the Red Hat Universal
Base Images (or UBI) was only recently added to Toolbx [1], in version
0.0.99.4.  Before that, Toolbx would only pick the image for RHEL 8,
and even before that, it would pick the base 'ubi8' image, which isn't
designed for interactive command line use.

Due to this, RHEL >= 8.5 shipped a custom configuration file
in /etc/containers/toolbox.conf to specify the image.

However, that's not necessary anymore.  RHEL 10 is going to be a fresh
new operating system, and it will be better if we don't ship any custom
configuration that's not needed, because it will ensure consistency with
non-RHEL operating systems, including Fedora.

[1] Upstream commit 0a29b374e649437
    https://github.com/containers/toolbox/commit/0a29b374e649437
    https://github.com/containers/toolbox/issues/1065
This commit is contained in:
Debarshi Ray 2023-11-09 17:17:07 +01:00
parent d437e83604
commit 1d18729e66

View File

@ -11,7 +11,7 @@ Version: 0.0.99.4
%gometa -f
%endif
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Tool for containerized command line environments on Linux
License: ASL 2.0
@ -222,7 +222,7 @@ export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_
%install
%meson_install
%if 0%{?rhel}
%if 0%{?rhel} <= 9
install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
%endif
@ -254,6 +254,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
%changelog
* Thu Nov 09 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-6
- Drop the custom /etc/containers/toolbox.conf from RHEL 10 onwards
* Mon Oct 02 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-5
- Drop github.com/coreos/toolbox compatibility from RHEL 10 onwards