Do not run ubuntu-drivers autoinstall if system is a VirtualBox Client

This commit is contained in:
Alexander Grothe 2018-04-19 11:55:03 +02:00
parent c6df27ca0c
commit c43bcc30bb
3 changed files with 4 additions and 8 deletions

View File

@ -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 - name: use ubuntu-drivers to install additional drivers automatically
command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall
when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest")
ansible_distribution_version != "16.04"
# ubuntu-drivers-common tries to autoinstall # 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 #+END_SRC
** autoinstall-virtualbox-guest ** autoinstall-virtualbox-guest
This role installs the guest additions for virtualbox guests on Ubuntu 16.04 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_type == "virtualbox"
- ansible_virtualization_role == "guest" - ansible_virtualization_role == "guest"
- ansible_distribution == "Ubuntu" - ansible_distribution == "Ubuntu"
- ansible_distribution_version == "16.04"
- name: set xineliboutput as frontend - name: set xineliboutput as frontend
block: block:

View File

@ -10,7 +10,6 @@
- name: use ubuntu-drivers to install additional drivers automatically - name: use ubuntu-drivers to install additional drivers automatically
command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall
when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest")
ansible_distribution_version != "16.04"
# ubuntu-drivers-common tries to autoinstall # 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 :(

View File

@ -17,7 +17,6 @@
- ansible_virtualization_type == "virtualbox" - ansible_virtualization_type == "virtualbox"
- ansible_virtualization_role == "guest" - ansible_virtualization_role == "guest"
- ansible_distribution == "Ubuntu" - ansible_distribution == "Ubuntu"
- ansible_distribution_version == "16.04"
- name: set xineliboutput as frontend - name: set xineliboutput as frontend
block: block: