From 542b9cd526c1a983b16b74c4cb3855c2a3bddae3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 24 May 2023 14:40:52 -0700 Subject: [PATCH] Revert "Work around the f39 toolbox container not existing" This reverts commit 6baf67aefdc08b0b7cd00dafb629cce0eda05694. The f39 toolbox container exists now. --- lib/utils.pm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index dd9ac7f6..211f60be 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -584,13 +584,7 @@ sub _repo_setup_updates { assert_script_run "cd /mnt/update_repo"; # on CANNED, we need to enter the toolbox at this point if (get_var("CANNED")) { - my $tboxcmd = "toolbox -y enter"; - # FIXME there's no f39 toolbox container yet: - # https://github.com/containers/toolbox/issues/1233 - # drop this workaround when that's fixed - $tboxcmd .= " -r 38" if (get_var("VERSION") eq get_var("RAWREL")); - type_string "$tboxcmd\n"; - + type_string "toolbox -y enter\n"; # look for the little purple dot assert_screen "console_in_toolbox", 180; }