add ask_keyboard step (backport)

1 files changed, 19 insertions, 1 deletions

diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index d319782d7..9f9239ca9 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -14,6 +14,7 @@ $ENV{SHARE_PATH} ||= "/usr/share";
 my $authentication = authentication::get();
 my $security = security::level::get();
 my $net = {};
+my $locale;
 network::network::read_net_conf($net);
 
 $::isWizard = 1;
@@ -25,13 +26,29 @@ sub ask_license() {
 
 sub ask_language() {
     require lang;
-    my $locale = lang::read();
+    $locale = lang::read();
     any::selectLanguage_and_more_standalone($in, $locale);
     lang::write_and_install($locale, $in->do_pkgs);
     lang::set($locale);
     Gtk2->set_locale;
 }
 
+sub ask_keyboard() {
+    require keyboard;
+    my $keyboard = $locale ? keyboard::lang2keyboard($locale->{lang}) : keyboard::read_or_default();
+
+  choose:
+    $keyboard->{KEYBOARD} = $in->ask_from_listf(N("Keyboard"),
+                                                N("Please, choose your keyboard layout."),
+                                                sub { translate(keyboard::KEYBOARD2text($_[0])) },
+                                                [ keyboard::KEYBOARDs() ],
+                                                $keyboard->{KEYBOARD}) or return;
+
+    keyboard::group_toggle_choose($in, $keyboard) or goto choose;
+
+    keyboard::configure_and_set_standalone($keyboard);
+}
+
 sub ask_network() {
     my $modules_conf = modules::any_conf->read;
     require network::netconnect;
@@ -71,6 +88,7 @@ sub call {
 
 call('ask_license');
 call('ask_language');
+call('ask_keyboard');
 call('ask_network');
 $::WizardWindow->destroy; undef $::WizardWindow;
 $::Wizard_pix_up = 'redhat-config-users';