From 01de3488a27bc62443efe731ee57079f64514e8f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 19 Jul 2020 19:50:14 -0230 Subject: [PATCH] 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