diff options
| author | Colin Guthrie <colin@mageia.org> | 2015-02-11 10:53:36 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2015-02-11 11:01:25 +0000 |
| commit | 2f39b6acb3ae70a5538b9367a60c3b2b110e8cbf (patch) | |
| tree | 554c6a898e91c695dc3ccd4213248cc17a222304 /lib | |
| parent | fdccca5811b61b63904951349a604f3d20e40493 (diff) | |
| download | drakx-kbd-mouse-x11-2f39b6acb3ae70a5538b9367a60c3b2b110e8cbf.tar drakx-kbd-mouse-x11-2f39b6acb3ae70a5538b9367a60c3b2b110e8cbf.tar.gz drakx-kbd-mouse-x11-2f39b6acb3ae70a5538b9367a60c3b2b110e8cbf.tar.bz2 drakx-kbd-mouse-x11-2f39b6acb3ae70a5538b9367a60c3b2b110e8cbf.tar.xz drakx-kbd-mouse-x11-2f39b6acb3ae70a5538b9367a60c3b2b110e8cbf.zip | |
Suppress writing xorg.conf.d snippets for built in evdev defaults
This should allow us to keep a cleaner xorg.conf.d snippet when
generated at boot without specific configuration which should then
allow udev rules to override it without any problem.
Note: we default to a pc105 layout but evdev defaults to a pc104
layout. We should either adopt pc104, or adapt evdev to default to
pc105.
mga#14476
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/keyboard.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/keyboard.pm b/lib/keyboard.pm index b2c2af4..617dc39 100644 --- a/lib/keyboard.pm +++ b/lib/keyboard.pm @@ -627,10 +627,11 @@ sub write { "Section \"InputClass\"\n" . " Identifier \"system-keyboard\"\n" . " MatchIsKeyboard \"on\"\n"; - if ($keyboard->{'XkbLayout'}) { + my $isus = $keyboard->{'XkbLayout'} && $keyboard->{'XkbLayout'} eq "us"; + if ($keyboard->{'XkbLayout'} && !$isus) { $xorgconf .= " Option \"XkbLayout\" \"" . $keyboard->{'XkbLayout'} . "\"\n"; } - if ($keyboard->{'XkbModel'}) { + if ($keyboard->{'XkbModel'} && (!$isus || $keyboard->{'XkbModel'} ne "pc105")) { $xorgconf .= " Option \"XkbModel\" \"" . $keyboard->{'XkbModel'} . "\"\n"; } if ($keyboard->{'XkbVariant'}) { |