From 955c6f6b4af2cbb8ac8cfd7acef143c30f4ed548 Mon Sep 17 00:00:00 2001 From: Daniel SP Date: Sat, 2 Mar 2024 16:14:41 -0500 Subject: [PATCH] Fix cgroups cmdline path (#456) * Fix cgroups cmdline path * Add check and variable so that we write to the correct file * Add LSB release checks. This is untested atm. * Break test into multiple lines so that we can pass lint checks * Flip logic on its head and check for existence only rather than content per contributor suggestion --------- Co-authored-by: Techno Tim --- roles/raspberrypi/tasks/setup/Raspbian.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/roles/raspberrypi/tasks/setup/Raspbian.yml b/roles/raspberrypi/tasks/setup/Raspbian.yml index 03fd9431b..0e32c2d82 100644 --- a/roles/raspberrypi/tasks/setup/Raspbian.yml +++ b/roles/raspberrypi/tasks/setup/Raspbian.yml @@ -1,7 +1,27 @@ --- +- name: Test for cmdline path + stat: + path: /boot/firmware/cmdline.txt + register: boot_cmdline_path + failed_when: false + changed_when: false + +- name: Set cmdline path based on Debian version and command result + set_fact: + cmdline_path: >- + {{ + ( + boot_cmdline_path.stat.exists and + ansible_facts.lsb.description | default('') is match('Debian.*(?!(bookworm|sid))') + ) | ternary( + '/boot/firmware/cmdline.txt', + '/boot/cmdline.txt' + ) + }} + - name: Activating cgroup support lineinfile: - path: /boot/cmdline.txt + path: "{{ cmdline_path }}" regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$' line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory' backrefs: true