From 260653229b880b9b2def2b93b01594b616e042d7 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Tue, 4 Sep 2018 13:21:32 +0200 Subject: [PATCH] Rearrange Installation of xineliboutput when a VM is detected --- Manual.org | 4 ++-- roles/autoinstall-virtualbox-guest/tasks/main.yml | 2 +- yavdr07.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Manual.org b/Manual.org index f84f30b..11fe1a1 100644 --- a/Manual.org +++ b/Manual.org @@ -171,9 +171,9 @@ The ~yavdr07.yml~ playbook sets up a fully-featured yaVDR installation: - collect-facts # query system facts - autoinstall-ubuntu-drivers # use ubuntu-drivers to install proprietary dirvers # (e.g. nvidia, virtualbox) - - autoinstall-virtualbox-guest # - nvidia-experimental # install very recent nvidia dirver from ppa:graphics-drivers/ppa - vdr # install vdr and related packages + - autoinstall-virtualbox-guest - yavdr-network # enable network client capabilities - samba-install # install samba server - samba-config # configure samba server @@ -4650,7 +4650,7 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04 - vdrctl enable xineliboutput ignore_errors: yes when: - - ansible_virtualization_type == "virtualbox" + - ansible_virtualization_type == "virtualbox" or ansible_virtualization_type == "VMware" - ansible_virtualization_role == "guest" #+END_SRC ** autoinstall-atric-usb diff --git a/roles/autoinstall-virtualbox-guest/tasks/main.yml b/roles/autoinstall-virtualbox-guest/tasks/main.yml index cea1b7e..e240502 100644 --- a/roles/autoinstall-virtualbox-guest/tasks/main.yml +++ b/roles/autoinstall-virtualbox-guest/tasks/main.yml @@ -36,5 +36,5 @@ - vdrctl enable xineliboutput ignore_errors: yes when: - - ansible_virtualization_type == "virtualbox" + - ansible_virtualization_type == "virtualbox" or ansible_virtualization_type == "VMware" - ansible_virtualization_role == "guest" diff --git a/yavdr07.yml b/yavdr07.yml index e171680..947144a 100644 --- a/yavdr07.yml +++ b/yavdr07.yml @@ -10,9 +10,9 @@ - collect-facts # query system facts - autoinstall-ubuntu-drivers # use ubuntu-drivers to install proprietary dirvers # (e.g. nvidia, virtualbox) - - autoinstall-virtualbox-guest # - nvidia-experimental # install very recent nvidia dirver from ppa:graphics-drivers/ppa - vdr # install vdr and related packages + - autoinstall-virtualbox-guest - yavdr-network # enable network client capabilities - samba-install # install samba server - samba-config # configure samba server