Unverified Commit 09a68c39 authored by Julien DOCHE's avatar Julien DOCHE Committed by GitHub
Browse files

Merge pull request #63 from JohnTheNerd/master

Fixed Raspbian detection on 64-bit kernel, made reboot only do so if needed
parents 9ff27448 05ade9a4
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
---
- name: reboot
  reboot:
+6 −6
Original line number Diff line number Diff line
@@ -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,12 +14,15 @@
    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
  notify: reboot
  when:
    - raspbian is true

- name: Flush iptables before changing to iptables-legacy
  iptables:
    flush: true
  when: raspbian
  changed_when: false   # iptables flush always returns changed

- name: Changing to iptables-legacy
  alternatives:
@@ -33,7 +37,3 @@
    name: ip6tables
  register: ip6_legacy
  when: raspbian

- name: Rebooting
  reboot:
  when: raspbian