From 886fff4f0907be627325ecc63b6a00af550d1301 Mon Sep 17 00:00:00 2001
From: Alexander Grothe <seahawk1986@gmx.de>
Date: Sun, 7 Jan 2018 12:56:46 +0100
Subject: [PATCH] First try to improve automatic xorg configuration

in order to prevent wrong screen connection names
---
 Manual.org                             | 41 ++++++++++++++++++++++----
 roles/yavdr-xorg/tasks/detect-xorg.yml | 40 +++++++++++++++++++++----
 2 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/Manual.org b/Manual.org
index a27bbe2..5123e5d 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1827,16 +1827,46 @@ b'\xde\xad\xbe\xef'
 
 - name: "start x-verbose@.service"
   systemd:
-    name: "x-verbose@vt7.service"
-    state: started
-    enabled: false
-    masked: false
-    daemon_reload: true
+      name: "x-verbose@vt7.service"
+      state: started
+      enabled: false
+      masked: false
+      daemon_reload: true
 
 - name: "wait a little bit, so X has some time to start up (needed?)"
   wait_for:
     timeout: 3
 
+- name: "stop x-verbose@vt7.service"
+  systemd:
+    name: "x-verbose@vt7.service"
+    state: stopped
+    enabled: false
+    masked: true
+
+- name: "wait a little bit, so X has some time to shut down (needed?)"
+  wait_for:
+    timeout: 3
+
+- name: "trigger udevadm reload"
+  command: 'udevadm trigger '
+
+- name: "wait a little bit, so udev has some time to reapply rules (needed?)"
+  wait_for:
+    timeout: 3
+
+- name: "start x-verbose@.service"
+systemd:
+name: "x-verbose@vt7.service"
+state: started
+enabled: false
+masked: false
+daemon_reload: true
+
+- name: "wait a little bit, so X has some time to start up (needed?)"
+wait_for:
+timeout: 3
+
 - name: "detect xorg configuration"
   action: xrandr_facts
 
@@ -3580,6 +3610,7 @@ dependencies:
         - eventlircd.service
         - eventlircd.socket
         - lircd2uinput.service
+        
         - lircd.service
       tags:
         - systemd
diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml
index c684934..db98e90 100644
--- a/roles/yavdr-xorg/tasks/detect-xorg.yml
+++ b/roles/yavdr-xorg/tasks/detect-xorg.yml
@@ -34,16 +34,46 @@
 
 - name: "start x-verbose@.service"
   systemd:
-    name: "x-verbose@vt7.service"
-    state: started
-    enabled: false
-    masked: false
-    daemon_reload: true
+      name: "x-verbose@vt7.service"
+      state: started
+      enabled: false
+      masked: false
+      daemon_reload: true
 
 - name: "wait a little bit, so X has some time to start up (needed?)"
   wait_for:
     timeout: 3
 
+- name: "stop x-verbose@vt7.service"
+  systemd:
+    name: "x-verbose@vt7.service"
+    state: stopped
+    enabled: false
+    masked: true
+
+- name: "wait a little bit, so X has some time to shut down (needed?)"
+  wait_for:
+    timeout: 3
+
+- name: "trigger udevadm reload"
+  command: 'udevadm trigger '
+
+- name: "wait a little bit, so udev has some time to reapply rules (needed?)"
+  wait_for:
+    timeout: 3
+
+- name: "start x-verbose@.service"
+systemd:
+name: "x-verbose@vt7.service"
+state: started
+enabled: false
+masked: false
+daemon_reload: true
+
+- name: "wait a little bit, so X has some time to start up (needed?)"
+wait_for:
+timeout: 3
+
 - name: "detect xorg configuration"
   action: xrandr_facts