From e9cc0fec549f6e8981b0e37517bdc2440410b87e Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Sun, 30 Jul 2017 23:28:13 +0200 Subject: [PATCH] use vdr.user variable for xlogin session start --- Manual.org | 5 +++-- roles/yavdr-xorg/tasks/desktop-session.yml | 3 ++- roles/yavdr-xorg/tasks/detect-xorg.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Manual.org b/Manual.org index 26d549a..f3246eb 100644 --- a/Manual.org +++ b/Manual.org @@ -1467,7 +1467,7 @@ b'\xde\xad\xbe\xef' - name: Stop xlogin systemd: - name: xlogin@vdr.service + name: 'xlogin@{{ vdr.user }}.service' state: stopped enabled: yes @@ -1611,8 +1611,9 @@ b'\xde\xad\xbe\xef' src: /usr/bin/start-desktop dest: /var/lib/vdr/plugins/desktop/starter state: link + force: false -- name: enable and start xlogin for the user vdr +- name: enable and start xlogin for the vdr user systemd: daemon_reload: yes name: 'xlogin@{{ vdr.user }}' diff --git a/roles/yavdr-xorg/tasks/desktop-session.yml b/roles/yavdr-xorg/tasks/desktop-session.yml index fc0812a..b5f5d29 100644 --- a/roles/yavdr-xorg/tasks/desktop-session.yml +++ b/roles/yavdr-xorg/tasks/desktop-session.yml @@ -90,8 +90,9 @@ src: /usr/bin/start-desktop dest: /var/lib/vdr/plugins/desktop/starter state: link + force: false -- name: enable and start xlogin for the user vdr +- name: enable and start xlogin for the vdr user systemd: daemon_reload: yes name: 'xlogin@{{ vdr.user }}' diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml index a7bb769..0e54e87 100644 --- a/roles/yavdr-xorg/tasks/detect-xorg.yml +++ b/roles/yavdr-xorg/tasks/detect-xorg.yml @@ -21,7 +21,7 @@ - name: Stop xlogin systemd: - name: xlogin@vdr.service + name: 'xlogin@{{ vdr.user }}.service' state: stopped enabled: yes