diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-08-24 10:35:39 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-08-24 10:35:39 +0000 |
| commit | f97ba1f0db7041622571bf416b49aad2e78b69e3 (patch) | |
| tree | 978c57b50bf527f7ff1bbcaa73a3d7813c20d0c5 | |
| parent | 7fc4f699f5378ea42e6dc944feeaf8b7fe27e70f (diff) | |
| download | drakx-backup-do-not-use-f97ba1f0db7041622571bf416b49aad2e78b69e3.tar drakx-backup-do-not-use-f97ba1f0db7041622571bf416b49aad2e78b69e3.tar.gz drakx-backup-do-not-use-f97ba1f0db7041622571bf416b49aad2e78b69e3.tar.bz2 drakx-backup-do-not-use-f97ba1f0db7041622571bf416b49aad2e78b69e3.tar.xz drakx-backup-do-not-use-f97ba1f0db7041622571bf416b49aad2e78b69e3.zip | |
small timeout when calling xmodmap (for drakx-in-chroot)
| -rw-r--r-- | perl-install/keyboard.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 80e340a10..dbc0b50f8 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -584,7 +584,9 @@ sub setup_install { setxkbmap($keyboard); } else { my $f = xmodmap_file($keyboard); - eval { run_program::run('xmodmap', $f) } if $f && !$::testing && $ENV{DISPLAY}; + #- timeout is needed for drakx-in-chroot to kill xmodmap when it gets crazy with: + #- please release the following keys within 2 seconds: Alt_L (keysym 0xffe9, keycode 64) + eval { run_program::raw({ timeout => 3 }, 'xmodmap', $f) } if $f && !$::testing && $ENV{DISPLAY}; } } |