testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-11-22 13:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load us layout before doing post-install aarch64 cmdline hack

Browse Source 
It seems that for some reason the localized layout gets loaded
on the installer VTs by this point in time, so we need to load
'us' again for this complex command to work.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-06-25 09:34:49 -07:00
parent 8e0764bc80
commit 861ad5d4aa
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/utils.pm
View File

@ -179,6 +179,9 @@ sub console_loadkeys_us {
if (get_var('LANGUAGE') eq 'french') { if (get_var('LANGUAGE') eq 'french') {
script_run "loqdkeys us", 0; script_run "loqdkeys us", 0;
} }
elsif (get_var('LANGUAGE') eq 'japanese') {
script_run "loadkeys us", 0;
}
} }
sub do_bootloader { sub do_bootloader {

5
tests/_do_install_and_reboot.pm
View File

@ -95,6 +95,11 @@ sub run {
# not the virtual console). Let's go fix this up now. # not the virtual console). Let's go fix this up now.
if (get_var("ARCH") eq "aarch64") { if (get_var("ARCH") eq "aarch64") {
$self->root_console(); $self->root_console();
# somehow, by this point, localized keyboard layout has been
# loaded for this tty, so for French and Arabic at least we
# need to load the 'us' layout again for the next command to
# be typed correctly
console_loadkeys_us;
# stick 'console=tty0' on the end of GRUB_CMDLINE_LINUX in # stick 'console=tty0' on the end of GRUB_CMDLINE_LINUX in
# the grub defaults file, and 'quiet' so we don't get kernel # the grub defaults file, and 'quiet' so we don't get kernel
# messages, which screws up some needles. RHBZ#1594402 # messages, which screws up some needles. RHBZ#1594402