summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-03 04:50:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-03 04:50:19 +0000
commit6edb6f8ffe78a3f6ca09cd63b12bdf08f3269f3d (patch)
tree3b7f830aabbb7573793c66f8f292b197e99d8abd
parentff036a133943d983ac7076b91557119e4949b7f5 (diff)
downloaddrakx-6edb6f8ffe78a3f6ca09cd63b12bdf08f3269f3d.tar
drakx-6edb6f8ffe78a3f6ca09cd63b12bdf08f3269f3d.tar.gz
drakx-6edb6f8ffe78a3f6ca09cd63b12bdf08f3269f3d.tar.bz2
drakx-6edb6f8ffe78a3f6ca09cd63b12bdf08f3269f3d.tar.xz
drakx-6edb6f8ffe78a3f6ca09cd63b12bdf08f3269f3d.zip
drop obsolete code (keymaps.cz2 and xmodmap.cz2 are dead since make_mdkinst_stage2 was dropped)
-rw-r--r--perl-install/keyboard.pm21
1 files changed, 1 insertions, 20 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 5dfbede1e..301c2f7e1 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -544,16 +544,7 @@ sub keyboard2full_xkb {
sub xmodmap_file {
my ($keyboard) = @_;
- my $KEYBOARD = $keyboard->{KEYBOARD};
- my $f = "$ENV{SHARE_PATH}/xmodmap/xmodmap.$KEYBOARD";
- if (! -e $f) {
- eval {
- require packdrake;
- my $packer = new packdrake("$ENV{SHARE_PATH}/xmodmap.cz2", quiet => 1);
- $packer->extract_archive("/tmp", "xmodmap.$KEYBOARD");
- };
- $f = "/tmp/xmodmap.$KEYBOARD";
- }
+ my $f = "$ENV{SHARE_PATH}/xmodmap/xmodmap.$keyboard->{KEYBOARD}";
-e $f && $f;
}
@@ -583,16 +574,6 @@ sub setup_install {
log::l("loading keymap $kmap");
if (-e (my $f = "$ENV{SHARE_PATH}/keymaps/$kmap.bkmap")) {
load(scalar cat_($f));
- } elsif (-e (my $packed_kmaps = "$ENV{SHARE_PATH}/keymaps.cz2")) {
- my $kid = bg_command->new(sub {
- eval {
- require packdrake;
- my $packer = new packdrake($packed_kmaps, quiet => 1);
- $packer->extract_archive(undef, "$kmap.bkmap");
- };
- });
- local $/ = undef;
- eval { my $fd = $kid->{fd}; load(join('', <$fd>)) };
} elsif (-x '/bin/loadkeys') {
run_program::run('loadkeys', $kmap);
} else {