Merge branch 'master' into wifi-hw

roles/1-prep/tasks/hardware.yml

@@ -1,3 +1,25 @@
+- name: Install packages 'parted' and 'cloud-guest-utils' (so /usr/bin/growpart is available for expanding rootfs partition during boot)
+  package:
+    name:
+      - parted               # 2022-03-15: RasPiOS and Ubuntu install this regardless -- so rarely nec but just in case.
+      - cloud-guest-utils    # 2022-03-15: For growpart command -- though RasPiOS currently doesn't need this, as raspi-config's do_expand_rootfs() instead uses fdisk.  Ubuntu pre-installs cloud-guest-utils, for use with cloud-init.
+    state: present
+
+- name: "Install from templates: /usr/sbin/iiab-expand-rootfs, /etc/systemd/system/iiab-expand-rootfs.service"
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
+  with_items:
+    - { src: 'iiab-expand-rootfs', dest: '/usr/sbin/', mode: '0755' }
+    - { src: 'iiab-expand-rootfs.service', dest: '/etc/systemd/system/', mode: '0644' }
+
+- name: Enable /etc/systemd/system/iiab-expand-rootfs.service
+  systemd:
+    name: iiab-expand-rootfs
+    enabled: yes
+
+
 ##  DISCOVER PLATFORMS ######
 # Put conditional actions for hardware platforms here
 
@@ -20,14 +42,15 @@
 - include_tasks: raspberry_pi.yml
   when: first_run and rpi_model != "none"
 
+
 - name: Check if the identifier for Intel's NUC6 built-in WiFi is present
   shell: "lsusb | grep 8087:0a2b | wc | awk '{print $1}'"
   register: usb_NUC6
   ignore_errors: True
 
-- name: Download {{ iiab_download_url }}/iwlwifi-8000C-13.ucode to /lib/firmware for built-in WiFi on NUC6    # iiab_download_url is http://download.iiab.io/packages
+- name: Download {{ iiab_download_url }}/iwlwifi-8000C-13.ucode to /lib/firmware for built-in WiFi on NUC6
   get_url:
-    url: "{{ iiab_download_url }}/iwlwifi-8000C-13.ucode"
+    url: "{{ iiab_download_url }}/iwlwifi-8000C-13.ucode"    # http://download.iiab.io/packages
     dest: /lib/firmware
     timeout: "{{ download_timeout }}"
   when: usb_NUC6.stdout|int > 0

roles/1-prep/tasks/raspberry_pi.yml

@@ -38,15 +38,18 @@
 - name: '2021-07-27: SEE ALSO 4-5 networking packages LATER installed by https://github.com/iiab/iiab/blob/master/roles/2-common/tasks/network.yml'
   meta: noop
 
-- name: 'Install packages: cloud-guest-utils, dphys-swapfile, fake-hwclock'
+# 2022-03-15: This section is effectively now useless on RasPiOS (but apparently
+# serves a purpose on Ubuntu on RPi, where it installs dphys-swapfile and
+# fake-hwclock).  Still: @jvonau's above explanation of other OS's / other HW
+# suggest this code should possibly move in future, to helps others too?
+
+- name: 'Install packages: dphys-swapfile, fake-hwclock'
   package:
     name:
-      - cloud-guest-utils    # Contains 'growpart' for resizing a partition during boot, which is normally done with the aid of cloud-init
-      - dphys-swapfile       # 2021-07-27: RaspiOS installs this regardless -- autogenerate and use a swap file
-      - fake-hwclock         # 2021-07-27: RaspiOS installs this regardless -- save/restore system clock on machines without working RTC hardware
+      - dphys-swapfile    # 2021-03-15: For Ubuntu on RPi?  RasPiOS installs this regardless -- autogenerate and use a swap file
+      - fake-hwclock      # 2021-03-15: For Ubuntu on RPi?  RasPiOS installs this regardless -- save/restore system clock on machines without working RTC hardware
     state: present
 
-
 - name: Increase swap file size (to CONF_SWAPSIZE={{ pi_swap_file_size }} in /etc/dphys-swapfile) as kalite pip download fails
   lineinfile:
     path: /etc/dphys-swapfile
@@ -58,20 +61,3 @@
   systemd:    # Had been...a rare/legacy service that was NOT systemd
     name: dphys-swapfile
     state: restarted
-
-
-- name: Install RPi rootfs resizing (/usr/sbin/iiab-rpi-max-rootfs.sh) and its systemd service (/etc/systemd/system/iiab-rpi-root-resize.service), from templates (root:root by default)
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    #owner: root
-    #group: root
-    mode: "{{ item.mode }}"
-  with_items:
-    - { src: 'iiab-rpi-max-rootfs.sh', dest: '/usr/sbin/', mode: '0755' }
-    - { src: 'iiab-rpi-root-resize.service', dest: '/etc/systemd/system/', mode: '0644' }
-
-- name: Enable RPi rootfs resizing (systemd service iiab-rpi-root-resize.service)
-  systemd:
-    name: iiab-rpi-root-resize
-    enabled: yes