fix root console login with switched keyboard layout

we only 'double' the password for the user account, not for root
this is a trivial fix so just pushing it out to get cyrillic
test working at last (hopefully)
This commit is contained in:
Adam Williamson 2016-06-06 12:00:26 -07:00
parent 46c6ed3cdb
commit 87da472f03

View File

@ -65,9 +65,9 @@ sub console_login {
} }
elsif ($needpass and check_screen "console_password_required", 0) { elsif ($needpass and check_screen "console_password_required", 0) {
type_string "$args{password}"; type_string "$args{password}";
if (get_var("SWITCHED_LAYOUT")) { if (get_var("SWITCHED_LAYOUT") and $args{user} ne "root") {
# see _do_install_and_reboot; when layout is switched # see _do_install_and_reboot; when layout is switched
# password is doubled to contain both US and native # user password is doubled to contain both US and native
# chars # chars
$self->console_switch_layout(); $self->console_switch_layout();
type_string "$args{password}"; type_string "$args{password}";