diff options
| -rw-r--r-- | perl-install/install2.pm | 8 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 14 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 3 | ||||
| -rw-r--r-- | perl-install/keyboard.pm | 4 |
4 files changed, 12 insertions, 17 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index d342ae0eb..8bc57a176 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -91,14 +91,6 @@ sub selectLanguage { my ($clicked, $ent_number, $auto) = @_; installStepsCall($o, $auto, 'selectLanguage', $ent_number == 1); - - addToBeDone { - lang::write_langs($o->{prefix}, $o->{langs}); - } 'formatPartitions' unless $::g_auto_install; - addToBeDone { - lang::write($o->{prefix}, $o->{lang}); - keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang})); - } 'installPackages' unless $::g_auto_install; } #------------------------------------------------------------------------------ diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 690678002..43e7aaf65 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -93,20 +93,22 @@ sub selectLanguage { if ($o->{keyboard_unsafe} || !$o->{keyboard}) { $o->{keyboard_unsafe} = 1; $o->{keyboard} = keyboard::lang2keyboard($o->{lang}); - selectKeyboard($o) if !$::live; + keyboard::setup($o->{keyboard}) if !$::live; } + + addToBeDone { + lang::write_langs($o->{prefix}, $o->{langs}); + } 'formatPartitions' unless $::g_auto_install; + addToBeDone { + lang::write($o->{prefix}, $o->{lang}); + } 'installPackages' unless $::g_auto_install; } #------------------------------------------------------------------------------ sub selectKeyboard { my ($o) = @_; keyboard::setup($o->{keyboard}); - #- if we go back to the selectKeyboard, you must rewrite addToBeDone { - lang::write_langs($o->{prefix}, $o->{langs}); - } 'formatPartitions' unless $::g_auto_install; - addToBeDone { - lang::write($o->{prefix}, $o->{lang}); keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang})); } 'installPackages' unless $::g_auto_install; } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index c16e04d49..3e61b1470 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -155,7 +155,8 @@ sub selectKeyboard { my $l = keyboard::lang2keyboards($o->{lang}); #- good guess, don't ask - return if !$::expert && !$clicked && $l->[0][1] > 90; + return install_steps::selectKeyboard($o) + if !$::expert && !$clicked && $l->[0][1] > 90; my @best = map { $_->[0] } @$l; push @best, 'us_intl' if !member('us_intl', @best); diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 8ef9cadf3..4d4a64e84 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -365,7 +365,7 @@ sub write { my ($prefix, $keyboard, $charset, $isNotDelete) = @_; my $config = read_raw($prefix); - put_in_hash($config, { + put_in_hash($config, { KEYTABLE => keyboard2kmap($keyboard), KBCHARSET => $charset, }); @@ -373,7 +373,7 @@ sub write { DISABLE_WINDOWS_KEY => bool2yesno(detect_devices::isLaptop()), BACKSPACE => $isNotDelete ? "BackSpace" : "Delete", }); - setVarsInSh("$prefix/etc/sysconfig/keyboard", %$config); + setVarsInSh("$prefix/etc/sysconfig/keyboard", $config); run_program::rooted($prefix, "dumpkeys > /etc/sysconfig/console/default.kmap") or log::l("dumpkeys failed"); } |