From 6baf67aefdc08b0b7cd00dafb629cce0eda05694 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 13 Feb 2023 19:16:09 -0800 Subject: [PATCH] Work around the f39 toolbox container not existing On Rawhide, just use an f38 toolbox container for now. Signed-off-by: Adam Williamson --- lib/utils.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/utils.pm b/lib/utils.pm index b1ff7df0..87d15a8b 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -582,7 +582,13 @@ 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")) { - type_string "toolbox -y enter\n"; + 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"; + # look for the little purple dot assert_screen "console_in_toolbox", 180; }