From 861ad5d4aa8efbbb89a76220e0002f784a1fc4fd Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 25 Jun 2018 09:34:49 -0700 Subject: [PATCH] Load us layout before doing post-install aarch64 cmdline hack 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 --- lib/utils.pm | 3 +++ tests/_do_install_and_reboot.pm | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/lib/utils.pm b/lib/utils.pm index 6b34a6f9..8638f4bd 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -179,6 +179,9 @@ sub console_loadkeys_us { if (get_var('LANGUAGE') eq 'french') { script_run "loqdkeys us", 0; } + elsif (get_var('LANGUAGE') eq 'japanese') { + script_run "loadkeys us", 0; + } } sub do_bootloader { diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index cda1909d..83a72a19 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -95,6 +95,11 @@ sub run { # not the virtual console). Let's go fix this up now. if (get_var("ARCH") eq "aarch64") { $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 # the grub defaults file, and 'quiet' so we don't get kernel # messages, which screws up some needles. RHBZ#1594402