From 2167d28123a5751aadee6d69672bfa332038b106 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Sun, 30 Jul 2017 23:19:35 +0200 Subject: [PATCH] rearrange order of xorg tasks --- Manual.org | 15 +++++++-------- roles/yavdr-xorg/tasks/desktop-session.yml | 6 ++++++ roles/yavdr-xorg/tasks/detect-xorg.yml | 7 ------- roles/yavdr-xorg/tasks/main.yml | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Manual.org b/Manual.org index 06fef2c..26d549a 100644 --- a/Manual.org +++ b/Manual.org @@ -1394,8 +1394,8 @@ b'\xde\xad\xbe\xef' --- # file: roles/yavdr-xorg/tasks/main.yml - include: setup-xorg.yml tags=install,update -- include: desktop-session.yml tags=install,update - include: detect-xorg.yml tags=xorg:detect,install +- include: desktop-session.yml tags=install,update #+END_SRC **** setup-xorg #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/setup-xorg.yml :mkdirp yes :padline no @@ -1516,13 +1516,6 @@ b'\xde\xad\xbe\xef' src: templates/xorg.conf.j2 dest: /etc/X11/xorg.conf backup: yes - -- name: enable and start xlogin for the user vdr - systemd: - daemon_reload: yes - name: 'xlogin@{{ vdr.user }}' - enabled: yes - state: started #+END_SRC **** desktop-session #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/desktop-session.yml :mkdirp yes :padline no @@ -1619,6 +1612,12 @@ b'\xde\xad\xbe\xef' dest: /var/lib/vdr/plugins/desktop/starter state: link +- name: enable and start xlogin for the user vdr + systemd: + daemon_reload: yes + name: 'xlogin@{{ vdr.user }}' + enabled: yes + state: started #+END_SRC *** templates **** xorg diff --git a/roles/yavdr-xorg/tasks/desktop-session.yml b/roles/yavdr-xorg/tasks/desktop-session.yml index aaaf62c..fc0812a 100644 --- a/roles/yavdr-xorg/tasks/desktop-session.yml +++ b/roles/yavdr-xorg/tasks/desktop-session.yml @@ -91,3 +91,9 @@ dest: /var/lib/vdr/plugins/desktop/starter state: link +- name: enable and start xlogin for the user vdr + systemd: + daemon_reload: yes + name: 'xlogin@{{ vdr.user }}' + enabled: yes + state: started diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml index 434fd0b..a7bb769 100644 --- a/roles/yavdr-xorg/tasks/detect-xorg.yml +++ b/roles/yavdr-xorg/tasks/detect-xorg.yml @@ -70,10 +70,3 @@ src: templates/xorg.conf.j2 dest: /etc/X11/xorg.conf backup: yes - -- name: enable and start xlogin for the user vdr - systemd: - daemon_reload: yes - name: 'xlogin@{{ vdr.user }}' - enabled: yes - state: started diff --git a/roles/yavdr-xorg/tasks/main.yml b/roles/yavdr-xorg/tasks/main.yml index a295343..11e6d1b 100644 --- a/roles/yavdr-xorg/tasks/main.yml +++ b/roles/yavdr-xorg/tasks/main.yml @@ -1,5 +1,5 @@ --- # file: roles/yavdr-xorg/tasks/main.yml - include: setup-xorg.yml tags=install,update -- include: desktop-session.yml tags=install,update - include: detect-xorg.yml tags=xorg:detect,install +- include: desktop-session.yml tags=install,update