From 2f39b6acb3ae70a5538b9367a60c3b2b110e8cbf Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Wed, 11 Feb 2015 10:53:36 +0000
Subject: 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
---
 NEWS            | 1 +
 lib/keyboard.pm | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index c48e22d..116cb70 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- suppress writing xorg.conf.d snippets for built in evdev defaults (mga#14476)
 - fix typo in xorg.conf.d snippet
 
 Version 1.5 - 9 February 2015
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'}) {
-- 
cgit v1.2.1