import toolbox-0.0.99.3-0.2.module+el8.5.0+12395+c8e7922f

SOURCES/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch

@@ -0,0 +1,26 @@
+From 786c5065c73703ef46e13905a4672f1b4918310a Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Wed, 18 Aug 2021 17:55:21 +0200
+Subject: [PATCH] cmd/run: Make sosreport work by setting the HOST environment
+ variable
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1940037
+---
+ src/cmd/run.go | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cmd/run.go b/src/cmd/run.go
+index e8e96932415e..188f0f2394df 100644
+--- a/src/cmd/run.go
++++ b/src/cmd/run.go
+@@ -443,6 +443,7 @@ func constructExecArgs(container string,
+ 	execArgs = append(execArgs, detachKeys...)
+ 
+ 	execArgs = append(execArgs, []string{
++		"--env", "HOST=/run/host",
+ 		"--interactive",
+ 		"--tty",
+ 		"--user", currentUser.Username,
+-- 
+2.31.1
+

SOURCES/toolbox.conf

@@ -0,0 +1,17 @@
+[general]
+# Create a toolbox container for a different operating system distro than the
+# host. Cannot be used with 'image'.
+## distro = "fedora"
+
+# Create a toolbox container for a different operating system release than the
+# host. Cannot be used with 'image'.
+## release = "33"
+
+# Change the name of the image used to create the toolbox container. This is
+# useful for creating containers from custom-built images. Cannot be used with
+# 'distro' or 'release'.
+#
+# If the name does not contain a registry, the local image storage will be
+# consulted, and if it's not present there then it will be pulled from a
+# suitable remote registry.
+image = "registry.redhat.io/rhel8/support-tools:latest"

SPECS/toolbox.spec

@@ -9,7 +9,7 @@ Version:       0.0.99.3
 %global goipath github.com/containers/%{name}
 %gometa
 
-Release:       0.1%{?dist}
+Release:       0.2%{?dist}
 Summary:       Unprivileged development environment
 
 License:       ASL 2.0
@@ -20,10 +20,12 @@ URL:           https://github.com/containers/%{name}
 # $ cd src
 # $ go mod vendor
 Source0:       %{name}-%{version}-vendored.tar.xz
+Source1:       %{name}.conf
 
 # RHEL specific
 Patch100:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
 Patch101:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
+Patch102:      toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1905383
 ExcludeArch:   %{ix86}
@@ -34,6 +36,7 @@ BuildRequires: meson
 BuildRequires: pkgconfig(bash-completion)
 BuildRequires: systemd
 
+Requires:      containers-common
 Requires:      podman >= 1.4.0
 
 
@@ -61,6 +64,8 @@ The %{name}-tests package contains system tests for %{name}.
 %patch101 -p1
 %endif
 
+%patch102 -p1
+
 # %%gomkdir is absent from RHEL 8.
 GOBUILDDIR="$(pwd)/_build"
 GOSOURCEDIR="$(pwd)"
@@ -88,6 +93,7 @@ ln -s src/vendor vendor
 
 %install
 %meson_install
+install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %files
@@ -106,6 +112,10 @@ ln -s src/vendor vendor
 
 
 %changelog
+* Thu Aug 26 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-0.2
+- Make sosreport work by setting the HOST environment variable
+- Related: #1934415
+
 * Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-0.1
 - change release to 0.x so it is obvious it is devel version
 - Related: #1934415