Merge pull request #63 from JohnTheNerd/master

Fixed Raspbian detection on 64-bit kernel, made reboot only do so if needed
This commit is contained in:
Julien DOCHE
2020-08-05 12:20:10 +02:00
committed by GitHub
2 changed files with 9 additions and 6 deletions

View File

@@ -0,0 +1,3 @@
---
- name: reboot
reboot:

View File

@@ -5,7 +5,8 @@
( ansible_facts.architecture is search("arm") and ( ansible_facts.architecture is search("arm") and
ansible_facts.lsb.description is match("[Rr]aspbian.*[Bb]uster") ) or ansible_facts.lsb.description is match("[Rr]aspbian.*[Bb]uster") ) or
( ansible_facts.architecture is search("aarch64") and ( 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 - name: Activating cgroup support
lineinfile: lineinfile:
@@ -13,12 +14,15 @@
regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$' regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory' line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
backrefs: true backrefs: true
when: raspbian notify: reboot
when:
- raspbian is true
- name: Flush iptables before changing to iptables-legacy - name: Flush iptables before changing to iptables-legacy
iptables: iptables:
flush: true flush: true
when: raspbian when: raspbian
changed_when: false # iptables flush always returns changed
- name: Changing to iptables-legacy - name: Changing to iptables-legacy
alternatives: alternatives:
@@ -33,7 +37,3 @@
name: ip6tables name: ip6tables
register: ip6_legacy register: ip6_legacy
when: raspbian when: raspbian
- name: Rebooting
reboot:
when: raspbian