From 6cf02c530404da81e7d54565007cecbf1f104a26 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Thu, 23 May 2019 16:27:05 +0200 Subject: [PATCH] Improve check for nvidia driver so it works also on remote machines --- Manual.org | 12 ++++++++++-- roles/yavdr-xorg/tasks/detect-xorg.yml | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Manual.org b/Manual.org index 0b37bb6..0e1b152 100644 --- a/Manual.org +++ b/Manual.org @@ -2692,9 +2692,17 @@ preferred_refreshrates: name: x@vt7.service state: stopped -- name: check if a nvidia driver has been installed +- name: check /etc/yavdr/autoinstalled if a nvidia driver has been installed + lineinfile: + name: /etc/yavdr/autoinstalled + regexp: '.*nvidia.*' + state: absent + check_mode: yes + register: nvidia_detected + +- name: set_fact | nvidia_driver_installed set_fact: - nvidia_driver_installed: '{{ "nvidia" in lookup("file", "/etc/yavdr/autoinstalled") }}' + nvidia_driver_installed: '{{ nvidia_detected.changed }}' - name: unload nouveau driver, replace with nvidia block: diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml index 5b27146..d54a7c6 100644 --- a/roles/yavdr-xorg/tasks/detect-xorg.yml +++ b/roles/yavdr-xorg/tasks/detect-xorg.yml @@ -41,9 +41,17 @@ name: x@vt7.service state: stopped -- name: check if a nvidia driver has been installed +- name: check /etc/yavdr/autoinstalled if a nvidia driver has been installed + lineinfile: + name: /etc/yavdr/autoinstalled + regexp: '.*nvidia.*' + state: absent + check_mode: yes + register: nvidia_detected + +- name: set_fact | nvidia_driver_installed set_fact: - nvidia_driver_installed: '{{ "nvidia" in lookup("file", "/etc/yavdr/autoinstalled") }}' + nvidia_driver_installed: '{{ nvidia_detected.changed }}' - name: unload nouveau driver, replace with nvidia block: