testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Fix 'clear' after login in French

Browse Source 
...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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-12-14 09:06:12 -08:00
parent 0b1d481ae1
commit 501b4bccc8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/utils.pm
View File

@ -237,9 +237,11 @@ sub console_login {
assert_screen [$good, 'console_password_required'], 30; assert_screen [$good, 'console_password_required'], 30;
# on a live image, just the user name will be enough # on a live image, just the user name will be enough
if (match_has_tag $good) { if (match_has_tag $good) {
# clear the screen (so the remaining login prompt text doesn't # clear the screen (so the remaining login prompt text
# confuse subsequent runs of this) # doesn't confuse subsequent runs of this)
type_string "clear\n"; my $clearstr = "clear\n";
$clearstr = "cleqr\n" if (get_var("LANGUAGE") eq 'french');
type_string $clearstr;
_console_login_finish(); _console_login_finish();
return; return;
} }
@ -265,9 +267,11 @@ sub console_login {
$timeout = 90 if (get_var("ARCH") eq "aarch64"); $timeout = 90 if (get_var("ARCH") eq "aarch64");
assert_screen($good, $timeout); assert_screen($good, $timeout);
} }
# clear the screen (so the remaining login prompt text doesn't # clear the screen (so the remaining login prompt text
# confuse subsequent runs of this) # doesn't confuse subsequent runs of this)
type_string "clear\n"; my $clearstr = "clear\n";
$clearstr = "cleqr\n" if (get_var("LANGUAGE") eq 'french');
type_string $clearstr;
} }
_console_login_finish(); _console_login_finish();
} }