diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-02-22 12:14:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-02-22 12:14:20 +0000 |
| commit | 213e385df136bdea70f5edfcbb85336120c87c96 (patch) | |
| tree | 8113676579032fc7c64c2e68119e4814d40185d0 /perl-install/install_steps.pm | |
| parent | 12b224d0ed08d9adb5bb342768e441901b0e530c (diff) | |
| download | drakx-backup-do-not-use-213e385df136bdea70f5edfcbb85336120c87c96.tar drakx-backup-do-not-use-213e385df136bdea70f5edfcbb85336120c87c96.tar.gz drakx-backup-do-not-use-213e385df136bdea70f5edfcbb85336120c87c96.tar.bz2 drakx-backup-do-not-use-213e385df136bdea70f5edfcbb85336120c87c96.tar.xz drakx-backup-do-not-use-213e385df136bdea70f5edfcbb85336120c87c96.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 78195440b..db66ebb92 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -659,8 +659,8 @@ sub setupBootloader($) { sub setupXfreeBefore { my ($o) = @_; my $xkb = $o->{X}{keyboard}{xkb_keymap} || keyboard::keyboard2xkb($o->{keyboard}); - unless (-e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$xkb") { - commands::cp("-f", keyboard::xmodmap_file($o->{keyboard}), "$o->{prefix}/etc/X11/xinit/Xmodmap"); + if (!-e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$xkb" && (my $f = keyboard::xmodmap_file($o->{keyboard}))) { + commands::cp("-f", $f, "$o->{prefix}/etc/X11/xinit/Xmodmap"); $xkb = ''; } $o->{X}{keyboard}{xkb_keymap} = $xkb; |