From 534902a206aef7ba50fa44bbd002daf2868e912a Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 25 Aug 2020 10:49:04 -0500
Subject: [PATCH 1/3] update usbmount_0.0.22_all.deb and add RPiOS-64bit
 support

---
 roles/2-common/tasks/packages.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
index eeb0a87c4..a39b6016f 100644
--- a/roles/2-common/tasks/packages.yml
+++ b/roles/2-common/tasks/packages.yml
@@ -16,9 +16,8 @@
 
 - name: Install {{ iiab_download_url }}/usbmount_0.0.14.1_all.deb, missing from Debian (debian-9 or debian-10, if NOT rpi)
   apt:
-    deb: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb"
-    #timeout: "{{ download_timeout }}"    # Ansible's apt module doesn't support timeout parameter; that's ok as usbmount_0.0.14.1_all.deb is only 10KB
-  when: internet_available and (is_debian_9 or is_debian_10) and not is_raspbian
+    deb: "{{ iiab_download_url }}/usbmount_0.0.22_all.deb"
+  when: is_debian_9 or is_debian_10 or ( is_raspbian and ansible_architecture == aarch64 )
 
 - name: "Install 6 deb/apt packages: avahi-daemon, exfat-fuse, exfat-utils, inetutils-syslogd, libnss-mdns, wpasupplicant (debuntu)"
   package:

From c1b04ad21fd4dddef798704ebad729269ef1e46d Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 25 Aug 2020 11:06:26 -0500
Subject: [PATCH 2/3] move package install to role

---
 roles/2-common/tasks/packages.yml |  6 ------
 roles/usb_lib/tasks/install.yml   | 13 +++++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
index a39b6016f..c22ba2944 100644
--- a/roles/2-common/tasks/packages.yml
+++ b/roles/2-common/tasks/packages.yml
@@ -14,11 +14,6 @@
     state: present
   when: is_redhat | bool
 
-- name: Install {{ iiab_download_url }}/usbmount_0.0.14.1_all.deb, missing from Debian (debian-9 or debian-10, if NOT rpi)
-  apt:
-    deb: "{{ iiab_download_url }}/usbmount_0.0.22_all.deb"
-  when: is_debian_9 or is_debian_10 or ( is_raspbian and ansible_architecture == aarch64 )
-
 - name: "Install 6 deb/apt packages: avahi-daemon, exfat-fuse, exfat-utils, inetutils-syslogd, libnss-mdns, wpasupplicant (debuntu)"
   package:
     name:
@@ -59,7 +54,6 @@
       - sudo
       - tar
       - unzip
-      - usbmount
       - usbutils
       - wget
     state: present
diff --git a/roles/usb_lib/tasks/install.yml b/roles/usb_lib/tasks/install.yml
index afc33b53b..299e9d627 100644
--- a/roles/usb_lib/tasks/install.yml
+++ b/roles/usb_lib/tasks/install.yml
@@ -1,3 +1,16 @@
+#http://raspbian.raspberrypi.org/raspbian/pool/main/u/usbmount/usbmount_0.0.22_all.deb
+- name: Install {{ iiab_download_url }}/usbmount_0.0.22_all.deb, missing from Debian
+  apt:
+    deb: "{{ iiab_download_url }}/usbmount_0.0.22_all.deb"
+  when: is_debian
+
+# check status of usbmount on mintlinux - should be ok Ubuntu variant
+- name: Install usbmount from OS for Ubuntu or RPiOS-32bit
+  package:
+    name: usbmount
+    state: present
+  when: is_ubuntu
+
 - name: Add dir {{ doc_root }}/local_content, where USB drive links can appear
   file:
     state: directory

From 1b2a1ad1dcaf36314f499e4d2f5bc27b0c4844a4 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 25 Aug 2020 13:25:04 -0500
Subject: [PATCH 3/3] better wording

---
 roles/usb_lib/tasks/install.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/usb_lib/tasks/install.yml b/roles/usb_lib/tasks/install.yml
index 299e9d627..375b0aa4c 100644
--- a/roles/usb_lib/tasks/install.yml
+++ b/roles/usb_lib/tasks/install.yml
@@ -5,7 +5,7 @@
   when: is_debian
 
 # check status of usbmount on mintlinux - should be ok Ubuntu variant
-- name: Install usbmount from OS for Ubuntu or RPiOS-32bit
+- name: Install usbmount from OS repo for Ubuntu variants
   package:
     name: usbmount
     state: present