From 214b1974ca6761a909a73db76a30445145e95bca Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sun, 19 Jun 2022 15:15:35 -0500
Subject: [PATCH] Fix virtualbox tools install (#9)

Ubuntu 22.04 has the tools available and does not need to install from
ISO. This was hanging, though no output seemed to indicate why. So we're
avoiding the ISO altogether and going with the Ubuntu packages
---
 ansible/roles/virtualbox/tasks/main.yml       | 24 +++++++++++++------
 .../roles/virtualbox/vars/Ubuntu_22.04.yml    |  3 +--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ansible/roles/virtualbox/tasks/main.yml b/ansible/roles/virtualbox/tasks/main.yml
index dfd79ab..8d3ff09 100644
--- a/ansible/roles/virtualbox/tasks/main.yml
+++ b/ansible/roles/virtualbox/tasks/main.yml
@@ -27,17 +27,27 @@
 
 - name: Run commands to install from ISO
   when: virtualbox_from_iso
+  become: true
   block:
-    - name: Mount iso file
-      become: true
-      ansible.builtin.command: "{{ item }}"
+    - name: Mount ISO file
+      ansible.posix.mount:
+        fstype: auto
+        path: /mnt
+        src: "{{ virtualbox_iso_location }}"
+        state: mounted
+        boot: false
+        opts: loop
+
+    - name: Install additions
+      ansible.builtin.command: /mnt/VBoxLinuxAdditions.run --nox11 2>&1 > /root/vbox_addon_install.log
       changed_when: false
       failed_when: _cmd.rc not in [0, 2]
       register: _cmd
-      loop:
-        - mount -o loop,ro {{ virtualbox_iso_location }} /mnt
-        - /mnt/VBoxLinuxAdditions.run --nox11
-        - umount /mnt
+
+    - name: Unmount ISO file
+      ansible.posix.mount:
+        path: /mnt
+        state: absent
 
 - name: Remove packages
   become: true
diff --git a/ansible/roles/virtualbox/vars/Ubuntu_22.04.yml b/ansible/roles/virtualbox/vars/Ubuntu_22.04.yml
index 41378a3..96df7de 100644
--- a/ansible/roles/virtualbox/vars/Ubuntu_22.04.yml
+++ b/ansible/roles/virtualbox/vars/Ubuntu_22.04.yml
@@ -4,6 +4,5 @@ virtualbox_packages:
   - tar
   - build-essential
 virtualbox_services: []
-virtualbox_from_iso: true
-virtualbox_iso_location: /home/vagrant/VBoxGuestAdditions.iso
+virtualbox_from_iso: false
 virtualbox_remove_packages: []