rearrange order of xorg tasks
This commit is contained in:
		
							
								
								
									
										15
									
								
								Manual.org
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user