Skip to content

Commit

Permalink
Merge branch 'bionic' of https://github.com/yavdr/yavdr-ansible into …
Browse files Browse the repository at this point in the history
…bionic
  • Loading branch information
seahawk1986 committed Jan 27, 2018
2 parents 928bbb5 + 85a0b26 commit d74da75
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
19 changes: 17 additions & 2 deletions Manual.org
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1795,6 +1795,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 }}'
Expand Down Expand Up @@ -2133,6 +2138,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"
Expand Down
5 changes: 5 additions & 0 deletions roles/yavdr-xorg/tasks/setup-xorg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,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 }}'
Expand Down
7 changes: 7 additions & 0 deletions roles/yavdr-xorg/templates/xorg-ignore-eventlircd.conf.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{{ ansible_managed | comment }}

Section "InputClass"
Identifier "exclude eventlircd devices"
MatchTag "eventlircd"
Option "Ignore" "True"
EndSection

0 comments on commit d74da75

Please sign in to comment.