From 265e5c027a93c86f9f885cc77452dc9b37e5b582 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 9 Aug 2023 15:33:44 -0700 Subject: [PATCH] Work around there being no F40 toolbox container yet See https://github.com/containers/toolbox/issues/1233#issuecomment-1672247681 we'll have to use an F39 container for now. Signed-off-by: Adam Williamson --- lib/utils.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/utils.pm b/lib/utils.pm index de0b63f6..c64fe24f 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -571,7 +571,12 @@ 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")) { - type_string "toolbox -y enter\n"; + # 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"; # look for the little purple dot assert_screen "console_in_toolbox", 180; }