From 84455d1f17e5c07d44218b7601b5a3d70511a493 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Wed, 28 Dec 2005 10:59:27 +0000
Subject: create new function and use it (backport for finish-install)

---
 perl-install/keyboard.pm              | 10 ++++++++++
 perl-install/standalone/keyboarddrake |  5 +----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 0399eb7ce..2480e9e48 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -621,6 +621,16 @@ sub configure_xorg {
     }
 }
 
+sub configure_and_set_standalone {
+    my ($keyboard) = @_;
+
+    configure_xorg($keyboard);
+    setxkbmap($keyboard);
+
+    &write($keyboard);
+    system('/etc/init.d/keytable', 'restart');
+}
+
 sub read() {
     my %keyboard = getVarsFromSh("$::prefix/etc/sysconfig/keyboard") or return;
     if (!$keyboard{KEYBOARD}) {
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index ef1e700aa..0961094ad 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -47,11 +47,8 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
     }
 }
 
-keyboard::setxkbmap($keyboard);
-keyboard::configure_xorg($keyboard);
 
-keyboard::write($keyboard);
-system('/etc/init.d/keytable', 'restart');
+keyboard::configure_and_set_standalone($keyboard);
 
 end:
     $in->exit(0) if $in;
-- 
cgit v1.2.1