frodovdr/yavdr-ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix order of xlogin package installation and calling write-x11-keyboard-config

Browse Source
This commit is contained in:
Alexander Grothe 2017-12-19 14:43:55 +01:00
parent 0c1f52d986
commit bde3106c47
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Manual.org
View File

@ -1670,12 +1670,6 @@ b'\xde\xad\xbe\xef'
- "/etc/systemd/system/user@{{ vdr.uid }}.service.d/" - "/etc/systemd/system/user@{{ vdr.uid }}.service.d/"
- "/etc/X11/xorg.conf.d/" - "/etc/X11/xorg.conf.d/"
- name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
command: write-x11-keyboard-config
creates: /etc/X11/xorg.conf.d/00-keyboard.conf
# NOTE: write-x11-keyboard-config is in the xlogin package
# Ubuntu's systemd is patched, so it does not create the file automatically
- name: systemd-drop-in | add dependency to X-server for vdr.service - name: systemd-drop-in | add dependency to X-server for vdr.service
template: template:
src: templates/vdr-xorg.conf src: templates/vdr-xorg.conf
@ -1736,6 +1730,12 @@ b'\xde\xad\xbe\xef'
- vdr-plugin-osd2web - vdr-plugin-osd2web
#- yavdr-xorg #- yavdr-xorg
- name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
command: write-x11-keyboard-config
creates: /etc/X11/xorg.conf.d/00-keyboard.conf
# NOTE: write-x11-keyboard-config is in the xlogin package
# Ubuntu's systemd is patched, so it does not create the file automatically
- name: apt | install desktop programs - name: apt | install desktop programs
apt: apt:
name: '{{ item }}' name: '{{ item }}'

12
roles/yavdr-xorg/tasks/setup-xorg.yml
View File

@ -10,12 +10,6 @@
- "/etc/systemd/system/user@{{ vdr.uid }}.service.d/" - "/etc/systemd/system/user@{{ vdr.uid }}.service.d/"
- "/etc/X11/xorg.conf.d/" - "/etc/X11/xorg.conf.d/"
- name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
command: write-x11-keyboard-config
creates: /etc/X11/xorg.conf.d/00-keyboard.conf
# NOTE: write-x11-keyboard-config is in the xlogin package
# Ubuntu's systemd is patched, so it does not create the file automatically
- name: systemd-drop-in | add dependency to X-server for vdr.service - name: systemd-drop-in | add dependency to X-server for vdr.service
template: template:
src: templates/vdr-xorg.conf src: templates/vdr-xorg.conf
@ -76,6 +70,12 @@
- vdr-plugin-osd2web - vdr-plugin-osd2web
#- yavdr-xorg #- yavdr-xorg
- name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
command: write-x11-keyboard-config
creates: /etc/X11/xorg.conf.d/00-keyboard.conf
# NOTE: write-x11-keyboard-config is in the xlogin package
# Ubuntu's systemd is patched, so it does not create the file automatically
- name: apt | install desktop programs - name: apt | install desktop programs
apt: apt:
name: '{{ item }}' name: '{{ item }}'