summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-11-23 16:13:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-11-23 16:13:37 +0000
commit3f01b48af73dcf40e0e6fd3cf62242bce4863422 (patch)
tree8842f47622a520a6e760b1f15e9f7cf33e0176e5
parentcffa15111fb73a3334e2e7f8fd653adcd16857cf (diff)
downloaddrakx-3f01b48af73dcf40e0e6fd3cf62242bce4863422.tar
drakx-3f01b48af73dcf40e0e6fd3cf62242bce4863422.tar.gz
drakx-3f01b48af73dcf40e0e6fd3cf62242bce4863422.tar.bz2
drakx-3f01b48af73dcf40e0e6fd3cf62242bce4863422.tar.xz
drakx-3f01b48af73dcf40e0e6fd3cf62242bce4863422.zip
create new function and use it
-rw-r--r--perl-install/keyboard.pm10
-rwxr-xr-xperl-install/standalone/keyboarddrake5
2 files changed, 11 insertions, 4 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 26263b181..9fb95da31 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -618,6 +618,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;