From 501b4bccc8ffdf24e77001636098c5b69ca5fa70 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 14 Dec 2019 09:06:12 -0800 Subject: [PATCH] Fix 'clear' after login in French ...because it comes out as 'cleqr'. Note, this may be fragile if we start doing more stuff post-install, but for now I think it's safe, I don't *think* we should ever hit this after running `loadkeys us`. Signed-off-by: Adam Williamson --- lib/utils.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index 4f2c41b9..83ea232c 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -237,9 +237,11 @@ sub console_login { assert_screen [$good, 'console_password_required'], 30; # on a live image, just the user name will be enough if (match_has_tag $good) { - # clear the screen (so the remaining login prompt text doesn't - # confuse subsequent runs of this) - type_string "clear\n"; + # clear the screen (so the remaining login prompt text + # doesn't confuse subsequent runs of this) + my $clearstr = "clear\n"; + $clearstr = "cleqr\n" if (get_var("LANGUAGE") eq 'french'); + type_string $clearstr; _console_login_finish(); return; } @@ -265,9 +267,11 @@ sub console_login { $timeout = 90 if (get_var("ARCH") eq "aarch64"); assert_screen($good, $timeout); } - # clear the screen (so the remaining login prompt text doesn't - # confuse subsequent runs of this) - type_string "clear\n"; + # clear the screen (so the remaining login prompt text + # doesn't confuse subsequent runs of this) + my $clearstr = "clear\n"; + $clearstr = "cleqr\n" if (get_var("LANGUAGE") eq 'french'); + type_string $clearstr; } _console_login_finish(); }