diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-04-05 11:53:34 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-04-05 11:53:34 +0000 |
| commit | cf1cbf14b0c673f6a0842244fb8fa3a941932247 (patch) | |
| tree | fd74ebc4768def1df5bac5504f2c0806c8489388 | |
| parent | dcab6db7ce620099d43182f421eb79a513caf47f (diff) | |
| download | drakx-backup-do-not-use-cf1cbf14b0c673f6a0842244fb8fa3a941932247.tar drakx-backup-do-not-use-cf1cbf14b0c673f6a0842244fb8fa3a941932247.tar.gz drakx-backup-do-not-use-cf1cbf14b0c673f6a0842244fb8fa3a941932247.tar.bz2 drakx-backup-do-not-use-cf1cbf14b0c673f6a0842244fb8fa3a941932247.tar.xz drakx-backup-do-not-use-cf1cbf14b0c673f6a0842244fb8fa3a941932247.zip | |
(configureXBefore): fix the xkb verification (was broken for things like ``de(nodeadkeys)'')
| -rw-r--r-- | perl-install/install_steps.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index e3a3cb625..c69c91a07 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -735,12 +735,11 @@ sub setupBootloader($) { sub configureXBefore { my ($o) = @_; my $xkb = $o->{X}{keyboard}{xkb_keymap} || keyboard::keyboard2xkb($o->{keyboard}); - $xkb = '' if !($xkb && -e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$xkb"); + $xkb = '' if !($xkb && $xkb =~ /([^(]*)/ && -e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$1"); if (!$xkb && (my $f = keyboard::xmodmap_file($o->{keyboard}))) { require commands; commands::cp("-f", $f, "$o->{prefix}/etc/X11/xinit/Xmodmap"); $xkb = ''; - } { my $f = "$o->{prefix}/etc/sysconfig/i18n"; |