Move creation of X11 keyboard configuration to external script

heredocs with indentations don't work properly in Ansible shell commands
This commit is contained in:
Alexander Grothe 2017-12-17 11:07:40 +01:00
parent f94dd32250
commit b1532f7a7a
2 changed files with 6 additions and 28 deletions

View File

@ -1477,20 +1477,9 @@ 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: shell | write keyboard configuration from /etc/default/keyboard to /etc/X11/xorg.conf.d/00-keyboard.conf - name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
shell: | # Note: write-x11-keyboard-config is in the xlogin package
source /etc/default/keyboard command: write-x11-keyboard-config
mkdir -p /etc/X11/xorg.conf.d/
cat > /etc/X11/xorg.conf.d/00-keyboard.conf <<EOF
Section "InputClass"
Identifier "system-keyboard"
MatchIsKeyboard "on"
Option "XkbLayout" "${XKBLAYOUT}"
Option "XkbModel" "${XKBMODEL}"
Option "XkbVariant" ",${XKBVARIANT}"
Option "XkbOptions" "${XKBOPTIONS}"
EndSection
EOF
- 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:

View File

@ -10,20 +10,9 @@
- "/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: shell | write keyboard configuration from /etc/default/keyboard to /etc/X11/xorg.conf.d/00-keyboard.conf - name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
shell: | # Note: write-x11-keyboard-config is in the xlogin package
source /etc/default/keyboard command: write-x11-keyboard-config
mkdir -p /etc/X11/xorg.conf.d/
cat > /etc/X11/xorg.conf.d/00-keyboard.conf <<EOF
Section "InputClass"
Identifier "system-keyboard"
MatchIsKeyboard "on"
Option "XkbLayout" "${XKBLAYOUT}"
Option "XkbModel" "${XKBMODEL}"
Option "XkbVariant" ",${XKBVARIANT}"
Option "XkbOptions" "${XKBOPTIONS}"
EndSection
EOF
- 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: