Merge pull request #2491 from jvonau/usbmnt2

BUGFIX Usbmnt2 [usbmount_0.0.14.1_all.deb -> usbmount_0.0.22_all.deb on Debian]

roles/2-common/tasks/packages.yml

@@ -14,12 +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.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
-
 - name: "Install 6 deb/apt packages: avahi-daemon, exfat-fuse, exfat-utils, inetutils-syslogd, libnss-mdns, wpasupplicant (debuntu)"
   package:
     name:
@@ -60,7 +54,6 @@
       - sudo
       - tar
       - unzip
-      - usbmount
       - usbutils
       - wget
     state: present

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 repo for Ubuntu variants
+  package:
+    name: usbmount
+    state: present
+  when: is_ubuntu
+
 - name: Add dir {{ doc_root }}/local_content, where USB drive links can appear
   file:
     state: directory