diff options
| -rw-r--r-- | perl-install/keyboard.pm | 10 | ||||
| -rwxr-xr-x | 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; |