From c43bcc30bbb7707b3c2d69b12bc82c4c818b3c97 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Thu, 19 Apr 2018 11:55:03 +0200 Subject: [PATCH] Do not run ubuntu-drivers autoinstall if system is a VirtualBox Client --- Manual.org | 6 ++---- roles/autoinstall-ubuntu-drivers/tasks/main.yml | 5 ++--- roles/autoinstall-virtualbox-guest/tasks/main.yml | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Manual.org b/Manual.org index 307fad2..9ed533f 100644 --- a/Manual.org +++ b/Manual.org @@ -3639,10 +3639,9 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi - name: use ubuntu-drivers to install additional drivers automatically command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall - when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or - ansible_distribution_version != "16.04" + when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") # ubuntu-drivers-common tries to autoinstall - # conflicting packages for virtualbox in Ubuntu 16.04 :( + # conflicting packages for virtualbox in Ubuntu 16.04 and 18.04 :( #+END_SRC ** autoinstall-virtualbox-guest This role installs the guest additions for virtualbox guests on Ubuntu 16.04 @@ -3667,7 +3666,6 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04 - ansible_virtualization_type == "virtualbox" - ansible_virtualization_role == "guest" - ansible_distribution == "Ubuntu" - - ansible_distribution_version == "16.04" - name: set xineliboutput as frontend block: diff --git a/roles/autoinstall-ubuntu-drivers/tasks/main.yml b/roles/autoinstall-ubuntu-drivers/tasks/main.yml index 131c8d1..802ca2e 100644 --- a/roles/autoinstall-ubuntu-drivers/tasks/main.yml +++ b/roles/autoinstall-ubuntu-drivers/tasks/main.yml @@ -10,7 +10,6 @@ - name: use ubuntu-drivers to install additional drivers automatically command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall - when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or - ansible_distribution_version != "16.04" + when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") # ubuntu-drivers-common tries to autoinstall - # conflicting packages for virtualbox in Ubuntu 16.04 :( + # conflicting packages for virtualbox in Ubuntu 16.04 and 18.04 :( diff --git a/roles/autoinstall-virtualbox-guest/tasks/main.yml b/roles/autoinstall-virtualbox-guest/tasks/main.yml index ae8cb5c..346dc76 100644 --- a/roles/autoinstall-virtualbox-guest/tasks/main.yml +++ b/roles/autoinstall-virtualbox-guest/tasks/main.yml @@ -17,7 +17,6 @@ - ansible_virtualization_type == "virtualbox" - ansible_virtualization_role == "guest" - ansible_distribution == "Ubuntu" - - ansible_distribution_version == "16.04" - name: set xineliboutput as frontend block: