From d3ca791a75641eeedb98db0a946b8ac5a7aa4655 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Wed, 24 Jan 2018 10:53:05 +0100 Subject: [PATCH 1/2] Move rule to ignore eventlircd devices in xorg to own xorg.conf.d snippet --- Manual.org | 15 +++++++++++++++ roles/yavdr-xorg/tasks/setup-xorg.yml | 5 +++++ .../templates/xorg-ignore-eventlircd.conf.j2 | 7 +++++++ 3 files changed, 27 insertions(+) create mode 100644 roles/yavdr-xorg/templates/xorg-ignore-eventlircd.conf.j2 diff --git a/Manual.org b/Manual.org index 114d0a5..f7d0a73 100644 --- a/Manual.org +++ b/Manual.org @@ -1790,6 +1790,11 @@ first_run: False # NOTE: write-x11-keyboard-config is in the xlogin package # Ubuntu's systemd is patched, so it does not create the file automatically +- name: add snippet to ignore eventlircd devices in xorg + template: + src: templates/xorg-ignore-eventlircd.conf.j2 + dest: /etc/X11/xorg.conf.d/40-ignore-eventlircd.conf + - name: apt | install desktop programs apt: name: '{{ item }}' @@ -2124,6 +2129,16 @@ Wants=x@vt7.service {{ ansible_managed | comment }} exec openbox-session #+END_SRC +***** xorg.conf snippets +#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/xorg-ignore-eventlircd.conf.j2 +{{ ansible_managed | comment }} + +Section "InputClass" + Identifier "exclude eventlircd devices" + MatchTag "eventlircd" + Option "Ignore" "True" +EndSection +#+END_SRC ***** xorg.conf #+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/xorg-verbose.conf.j2 Section "Device" diff --git a/roles/yavdr-xorg/tasks/setup-xorg.yml b/roles/yavdr-xorg/tasks/setup-xorg.yml index e8a2a43..1e4897e 100644 --- a/roles/yavdr-xorg/tasks/setup-xorg.yml +++ b/roles/yavdr-xorg/tasks/setup-xorg.yml @@ -88,6 +88,11 @@ # NOTE: write-x11-keyboard-config is in the xlogin package # Ubuntu's systemd is patched, so it does not create the file automatically +- name: add snippet to ignore eventlircd devices in xorg + template: + src: templates/xorg-ignore-eventlircd.conf.j2 + dest: /etc/X11/xorg.conf.d/40-ignore-eventlircd.conf + - name: apt | install desktop programs apt: name: '{{ item }}' diff --git a/roles/yavdr-xorg/templates/xorg-ignore-eventlircd.conf.j2 b/roles/yavdr-xorg/templates/xorg-ignore-eventlircd.conf.j2 new file mode 100644 index 0000000..e72cffb --- /dev/null +++ b/roles/yavdr-xorg/templates/xorg-ignore-eventlircd.conf.j2 @@ -0,0 +1,7 @@ +{{ ansible_managed | comment }} + +Section "InputClass" + Identifier "exclude eventlircd devices" + MatchTag "eventlircd" + Option "Ignore" "True" +EndSection From 85a0b26471035e5c8a764b8020bba2490252acd1 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Wed, 24 Jan 2018 11:12:03 +0100 Subject: [PATCH 2/2] small cleanup --- Manual.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Manual.org b/Manual.org index f7d0a73..1f2362c 100644 --- a/Manual.org +++ b/Manual.org @@ -69,7 +69,7 @@ Format: "%d:%d:%d" (lspci liefert es als "%04x:%02x:%02x.%x", domain, bus, devic - Wie mit mehreren GPUs umgehen? Priorität bzw. Reihenfolge? - Was ist mit NVidia Optimus/Bumblebee (AFAIK keine VDPAU-Funktionalität)? - Wie BusID der xrandr-Ausgabe zuordnen? -*** NVIDIA-Dokumentation zur BusID: +*** NOTE NVIDIA-Dokumentation zur BusID: **** What is the format of a PCI Bus ID? Different tools have different formats for the PCI Bus ID of a PCI device. @@ -886,7 +886,7 @@ install_avahi: true # shell: 'ethtool {{ item }} | grep -Po "(?<=Supports\sWake-on:\s).*$"' # register: wol # with_items: '{% for interface in ansible_interfaces if interface != 'lo' and interface != 'bond0' %}' - + - name: restart autofs if running systemd: name: autofs