From edcfed346d6f5e2b206a6ac9d611d51cf6187d26 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 10 Aug 2023 11:24:17 -0700
Subject: [PATCH] Revert "Work around there being no F40 toolbox container yet"

This reverts commit 265e5c027a93c86f9f885cc77452dc9b37e5b582.
The f40 toolbox container is now findable, so this shouldn't be
needed any more.
---
 lib/utils.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/utils.pm b/lib/utils.pm
index c64fe24f..de0b63f6 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -571,12 +571,7 @@ sub _repo_setup_updates {
     # will get the packages from the update.
     # on CANNED, we need to enter the toolbox at this point
     if (get_var("CANNED")) {
-        # FIXME: as of 2023-08, there's no toolbox container for
-        # F40 (new Rawhide) so we need to use 39:
-        # https://github.com/containers/toolbox/issues/1233
-        my $extraarg = "";
-        $extraarg = "-r 39 " if ($version eq "40");
-        type_string "toolbox ${extraarg}-y enter\n";
+        type_string "toolbox -y enter\n";
         # look for the little purple dot
         assert_screen "console_in_toolbox", 180;
     }