From 01de3488a27bc62443efe731ee57079f64514e8f Mon Sep 17 00:00:00 2001
From: John <hello@johnthenerd.com>
Date: Sun, 19 Jul 2020 19:50:14 -0230
Subject: [PATCH 1/3] Fixed Raspbian detection on 64-bit kernel, only reboot
 Raspbian if needed

---
 roles/raspbian/tasks/main.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/roles/raspbian/tasks/main.yml b/roles/raspbian/tasks/main.yml
index 22fb952..707d37d 100644
--- a/roles/raspbian/tasks/main.yml
+++ b/roles/raspbian/tasks/main.yml
@@ -5,7 +5,8 @@
       ( ansible_facts.architecture is search("arm") and
         ansible_facts.lsb.description is match("[Rr]aspbian.*[Bb]uster") ) or
       ( ansible_facts.architecture is search("aarch64") and
-        ansible_facts.lsb.description is match("Debian.*buster") ) %}True{% else %}False{% endif %}'
+        ansible_facts.lsb.description is match("Debian.*buster") or
+        ansible_facts.lsb.description is match("[Rr]aspbian.*[Bb]uster") ) %}true{% else %}false{% endif %}'
 
 - name: Activating cgroup support
   lineinfile:
@@ -13,7 +14,9 @@
     regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
     line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
     backrefs: true
-  when: raspbian
+  register: cgroup
+  when:
+    - raspbian is true
 
 - name: Flush iptables before changing to iptables-legacy
   iptables:
@@ -36,4 +39,7 @@
 
 - name: Rebooting
   reboot:
-  when: raspbian
+  when:
+    - cgroup.changed
+  tags:
+    - skip_ansible_lint

From 022bf9440f62e028c104066e814b98a3e2ffe7ae Mon Sep 17 00:00:00 2001
From: John <hello@johnthenerd.com>
Date: Thu, 30 Jul 2020 13:32:00 -0230
Subject: [PATCH 2/3] turned reboot into a handler

---
 roles/raspbian/tasks/main.yml | 10 ++--------
 site.yml                      |  3 +++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/roles/raspbian/tasks/main.yml b/roles/raspbian/tasks/main.yml
index 707d37d..04c931a 100644
--- a/roles/raspbian/tasks/main.yml
+++ b/roles/raspbian/tasks/main.yml
@@ -14,7 +14,7 @@
     regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
     line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
     backrefs: true
-  register: cgroup
+  notify: reboot
   when:
     - raspbian is true
 
@@ -22,6 +22,7 @@
   iptables:
     flush: true
   when: raspbian
+  changed_when: false   # iptables flush always returns changed
 
 - name: Changing to iptables-legacy
   alternatives:
@@ -36,10 +37,3 @@
     name: ip6tables
   register: ip6_legacy
   when: raspbian
-
-- name: Rebooting
-  reboot:
-  when:
-    - cgroup.changed
-  tags:
-    - skip_ansible_lint
diff --git a/site.yml b/site.yml
index 8862e96..46a24bd 100644
--- a/site.yml
+++ b/site.yml
@@ -8,6 +8,9 @@
     - role: download
     - role: raspbian
     - role: ubuntu
+  handlers:
+    - name: reboot
+      reboot:
 
 - hosts: master
   become: yes

From 05ade9a4bbe7f0424b341a49a1def31cd71fef4f Mon Sep 17 00:00:00 2001
From: John <hello@johnthenerd.com>
Date: Thu, 30 Jul 2020 22:03:14 -0230
Subject: [PATCH 3/3] moved handler inside the role folder

---
 roles/raspbian/handlers/main.yml | 3 +++
 site.yml                         | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 roles/raspbian/handlers/main.yml

diff --git a/roles/raspbian/handlers/main.yml b/roles/raspbian/handlers/main.yml
new file mode 100644
index 0000000..d25cf90
--- /dev/null
+++ b/roles/raspbian/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: reboot
+  reboot:
diff --git a/site.yml b/site.yml
index 46a24bd..8862e96 100644
--- a/site.yml
+++ b/site.yml
@@ -8,9 +8,6 @@
     - role: download
     - role: raspbian
     - role: ubuntu
-  handlers:
-    - name: reboot
-      reboot:
 
 - hosts: master
   become: yes