From 5de384d64df7337af4afe120e902abf9c6d1b85f Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 3 Nov 2018 22:38:22 -0400
Subject: [PATCH] Update raspberry_pi.yml

---
 roles/1-prep/tasks/raspberry_pi.yml | 39 ++++++++++++++++-------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/roles/1-prep/tasks/raspberry_pi.yml b/roles/1-prep/tasks/raspberry_pi.yml
index 89f1a6b66..1963a26d1 100644
--- a/roles/1-prep/tasks/raspberry_pi.yml
+++ b/roles/1-prep/tasks/raspberry_pi.yml
@@ -1,4 +1,4 @@
-# Setup specific to the Raspberry Pi
+# Specific to Raspberry Pi
 
 - name: Install udev rule /etc/udev/rules.d/92-rtc-i2c.rules from template, to transfer hwclock to system clock at dev creation, if rtc_id is defined and rtc_id != "none"
   template:
@@ -10,22 +10,22 @@
   when: rtc_id is defined and rtc_id != "none"
 
 # RTC requires a change to the device tree (and reboot)
-- name: Check for need to enable i2c-rtc device in /boot/config.txt (requires reboot!)
+- name: Enable i2c-rtc device (with "dtoverlay=i2c-rtc,{{ rtc_id }}=on" in /boot/config.txt) if rtc_id != "none" (requires reboot!)
   lineinfile:
-    dest: /boot/config.txt
+    path: /boot/config.txt
     line: "dtoverlay=i2c-rtc,{{ rtc_id }}=on"
     state: present
   register: rpiconfig    # HMMM REGISTER "rpiconfig" IS *COMPLETELY UNUSED* AS OF 2018-11-02
-  when: rtc_id != "none"
+  when: rtc_id is defined and rtc_id != "none"
 
-- name: Install udev rule /etc/udev/rules.d/92-rtc-i2c.rules from template, to transfer hwclock to system clock at dev creation, if rtc_id != "none"
-  template:
-    src: 92-rtc-i2c.rules
-    dest: /etc/udev/rules.d/92-rtc-i2c.rules
-    owner: root
-    group: root
-    mode: 0644
-  when: rtc_id != "none"
+#- name: Install udev rule /etc/udev/rules.d/92-rtc-i2c.rules from template, to transfer hwclock to system clock at dev creation, if rtc_id != "none"
+#  template:
+#    src: 92-rtc-i2c.rules
+#    dest: /etc/udev/rules.d/92-rtc-i2c.rules
+#    owner: root
+#    group: root
+#    mode: 0644
+#  when: rtc_id != "none"
 
 - name: Install latest ntp package
   package:
@@ -34,16 +34,19 @@
 
 - name: Increase swap file size (to CONF_SWAPSIZE=500 in /etc/dphys-swapfile) as kalite pip download fails (debuntu)
   lineinfile:
+    path: /etc/dphys-swapfile
     regexp: "^CONF_SWAPSIZE"
     line: CONF_SWAPSIZE=500
-    path: /etc/dphys-swapfile
   when: is_debuntu
 
-- name: Restart the swap service (debuntu)
-  command: /etc/init.d/dphys-swapfile restart
+- name: Restart swap service "dphys-swapfile" (debuntu)
+  #command: /etc/init.d/dphys-swapfile restart
+  service:    # A rare/legacy service that is NOT systemd
+    name: dphys-swapfile
+    state: restarted
   when: is_debuntu
 
-- name: Add RPi rootfs resizing systemd service
+- name: Install RPi rootfs resizing (iiab-rpi-max-rootfs.sh) and its systemd service (iiab-rpi-root-resize.service), from templates
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -54,7 +57,7 @@
     - { src: 'iiab-rpi-max-rootfs.sh', dest: '/usr/sbin/iiab-rpi-max-rootfs.sh', mode: '0755'}
     - { src: 'iiab-rpi-root-resize.service', dest: '/etc/systemd/system/iiab-rpi-root-resize.service', mode: '0644'}
 
-- name: Enable rootfs resizing service
-  service:
+- name: Enable RPi rootfs resizing (systemd service iiab-rpi-root-resize.service)
+  systemd:
     name: iiab-rpi-root-resize
     enabled: yes