From da4b2abc9ccc590ea5bf9a527ef36dc42a5f51e4 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Wed, 5 Apr 2023 09:36:41 +0200
Subject: [PATCH] Remove unused patches left behind by faulty branch creation

There's no need to do a build just for this.

Fallout from:
  * fb4ca7ffd4677c788e75478715eb02359ab94582
  * 8de74a0feb379089c3f994d985dd4b16e3e43645
  * c3495693f12f58417c757c7608521411b21c981c
  * 3038adcfcf9d2d2ecf62f49d30d0f00e6a063028

Resolves: #2164981, #2165744
---
 ...-a-way-forward-if-coreos-toolbox-was.patch | 44 -------------------
 ...report-work-by-setting-the-HOST-envi.patch | 26 -----------
 2 files changed, 70 deletions(-)
 delete mode 100644 toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch
 delete mode 100644 toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch

diff --git a/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch b/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch
deleted file mode 100644
index 258226c..0000000
--- a/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6b47ff61936d2b602d29b229b079bda00dadad7e Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Thu, 2 Sep 2021 14:57:37 +0200
-Subject: [PATCH] cmd/root: Suggest a way forward if coreos/toolbox was used
-
-github.com/coreos/toolbox bind mounts the entire /run from the host
-operating system into the toolbox container. Due to this, when run
-rootful, the /run/.containerenv created by Podman inside the container
-is also seen on the host. This confuses Toolbox into thinking that it's
-running inside a container, even when it's running on the host.
-
-This is an attempt to differentiate between a toolbox container and
-the host by looking at the 'container' environment variable, so that
-the user can be presented with a more helpful error message.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1998191
----
- src/cmd/root.go | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/cmd/root.go b/src/cmd/root.go
-index 5e6f5874a469..139609592218 100644
---- a/src/cmd/root.go
-+++ b/src/cmd/root.go
-@@ -130,6 +130,16 @@ func preRun(cmd *cobra.Command, args []string) error {
- 
- 	if toolboxPath == "" {
- 		if utils.IsInsideContainer() {
-+			if containerType := os.Getenv("container"); containerType == "" {
-+				var builder strings.Builder
-+				fmt.Fprintf(&builder, "/run/.containerenv found on what looks like the host\n")
-+				fmt.Fprintf(&builder, "If this is the host, then remove /run/.containerenv and try again.\n")
-+				fmt.Fprintf(&builder, "Otherwise, contact your system administrator or file a bug.")
-+
-+				errMsg := builder.String()
-+				return errors.New(errMsg)
-+			}
-+
- 			return errors.New("TOOLBOX_PATH not set")
- 		}
- 
--- 
-2.31.1
-
diff --git a/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch b/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch
deleted file mode 100644
index 84ae242..0000000
--- a/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-