From 640d27dfa37d800cd59290f118407ea5a4eb4533 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Sat, 16 Dec 2017 18:58:57 +0100 Subject: [PATCH] Fix condition to ubuntu-drivers autoinstall --- Manual.org | 10 ++++------ roles/autoinstall-ubuntu-drivers/tasks/main.yml | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Manual.org b/Manual.org index b2adb78..9ba4ed8 100644 --- a/Manual.org +++ b/Manual.org @@ -3199,12 +3199,10 @@ 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" - - ansible_virtualization_role != "guest" - - ansible_distribution == "Ubuntu" - - ansible_distribution_version != "16.04" # ubuntu-drivers-common tries to autoinstall - # conflicting packages for virtualbox :( + when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or + ansible_distribution_version != "16.04" + # ubuntu-drivers-common tries to autoinstall + # conflicting packages for virtualbox in Ubuntu 16.04 :( #+END_SRC ** autoinstall-virtualbox-guest This role installs the guest additions for virtualbox guests on Ubuntu 16.04 diff --git a/roles/autoinstall-ubuntu-drivers/tasks/main.yml b/roles/autoinstall-ubuntu-drivers/tasks/main.yml index dac22ae..131c8d1 100644 --- a/roles/autoinstall-ubuntu-drivers/tasks/main.yml +++ b/roles/autoinstall-ubuntu-drivers/tasks/main.yml @@ -10,9 +10,7 @@ - name: use ubuntu-drivers to install additional drivers automatically command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall - when: - - ansible_virtualization_type != "virtualbox" - - ansible_virtualization_role != "guest" - - ansible_distribution == "Ubuntu" - - ansible_distribution_version != "16.04" # ubuntu-drivers-common tries to autoinstall - # conflicting packages for virtualbox :( + when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or + ansible_distribution_version != "16.04" + # ubuntu-drivers-common tries to autoinstall + # conflicting packages for virtualbox in Ubuntu 16.04 :(