diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-17 07:53:41 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-17 07:53:41 +0000 |
| commit | b2ece6e1218b5d8b1bb19b7884d6ef5114f04f63 (patch) | |
| tree | efee67e93efcf8171e878cba88a67d30e9275159 | |
| parent | 8cd07b985ce798656997caa9ae3239855fa47d2a (diff) | |
| download | drakx-b2ece6e1218b5d8b1bb19b7884d6ef5114f04f63.tar drakx-b2ece6e1218b5d8b1bb19b7884d6ef5114f04f63.tar.gz drakx-b2ece6e1218b5d8b1bb19b7884d6ef5114f04f63.tar.bz2 drakx-b2ece6e1218b5d8b1bb19b7884d6ef5114f04f63.tar.xz drakx-b2ece6e1218b5d8b1bb19b7884d6ef5114f04f63.zip | |
fix applying keyboard configuration in globetrotter's first time wizard
| -rw-r--r-- | perl-install/install_gtk.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index c7086f915..dd5faef65 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -256,8 +256,7 @@ sub createXconf { symlink("/tmp/stage2/etc/X11", "/etc/X11"); if ($Driver) { - output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); - + output($file, sprintf(<<'END', ($::globetrotter ? "" : 'Option "XkbDisable"'), $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); Section "Files" FontPath "/usr/X11R6/lib/X11/fonts:unscaled" EndSection @@ -265,7 +264,7 @@ EndSection Section "InputDevice" Identifier "Keyboard" Driver "Keyboard" - Option "XkbDisable" + %s Option "XkbModel" "pc105" Option "XkbLayout" "" EndSection diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index bea50d03c..af9238fb2 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -48,7 +48,7 @@ sub new($$) { } elsif ($::globetrotter || !$::move) { install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0], $Driver); - push @options, '-kb', '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/ && arch() ne 'ppc'; + push @options, if_(!$::globetrotter, '-kb'), '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/ && arch() ne 'ppc'; push @options, 'tty7', '-dpms', '-s', '240'; #- old weird servers: Xpmac and Xsun |