From 842bfd8de9d88f4415516c5ce7db73ba63c4337d Mon Sep 17 00:00:00 2001 From: Daniel San Pedro Date: Sat, 24 Feb 2024 16:53:51 -0500 Subject: [PATCH 1/3] Fix cgroups cmdline path --- roles/raspberrypi/tasks/setup/Raspbian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/raspberrypi/tasks/setup/Raspbian.yml b/roles/raspberrypi/tasks/setup/Raspbian.yml index 03fd943..e4af193 100644 --- a/roles/raspberrypi/tasks/setup/Raspbian.yml +++ b/roles/raspberrypi/tasks/setup/Raspbian.yml @@ -1,7 +1,7 @@ --- - name: Activating cgroup support lineinfile: - path: /boot/cmdline.txt + path: /boot/firmware/cmdline.txt regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$' line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory' backrefs: true From 7db9f5bd9bf017c959148e57d628a7cb005c11be Mon Sep 17 00:00:00 2001 From: Daniel San Pedro Date: Sat, 24 Feb 2024 21:25:55 -0500 Subject: [PATCH 2/3] Add check and variable so that we write to the correct file --- roles/raspberrypi/tasks/setup/Raspbian.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/roles/raspberrypi/tasks/setup/Raspbian.yml b/roles/raspberrypi/tasks/setup/Raspbian.yml index e4af193..8860d85 100644 --- a/roles/raspberrypi/tasks/setup/Raspbian.yml +++ b/roles/raspberrypi/tasks/setup/Raspbian.yml @@ -1,7 +1,17 @@ --- +- name: Test for cmdline path + command: grep -E "console=|rootfstype" /boot/cmdline.txt + register: boot_cmdline_path + failed_when: false + changed_when: false + +- name: Set path to cmdline based on test + set_fact: + cmdline_path: "{{ (boot_cmdline_path.rc == 0) | ternary('/boot/cmdline.txt', '/boot/firmware/cmdline.txt') }}" + - name: Activating cgroup support lineinfile: - path: /boot/firmware/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 From d325eae726e15634b1bc7eb5dee2611d7b6ec851 Mon Sep 17 00:00:00 2001 From: Daniel San Pedro Date: Mon, 26 Feb 2024 23:39:07 -0500 Subject: [PATCH 3/3] Add LSB release checks. This is untested atm. --- roles/raspberrypi/tasks/setup/Raspbian.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/raspberrypi/tasks/setup/Raspbian.yml b/roles/raspberrypi/tasks/setup/Raspbian.yml index 8860d85..2778186 100644 --- a/roles/raspberrypi/tasks/setup/Raspbian.yml +++ b/roles/raspberrypi/tasks/setup/Raspbian.yml @@ -5,9 +5,9 @@ failed_when: false changed_when: false -- name: Set path to cmdline based on test +- name: Set cmdline path based on Debian version and boot_cmdline_path result set_fact: - cmdline_path: "{{ (boot_cmdline_path.rc == 0) | ternary('/boot/cmdline.txt', '/boot/firmware/cmdline.txt') }}" + cmdline_path: "{{ (boot_cmdline_path.rc == 0 and ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_version'] is version('bookworm', '<')) | ternary('/boot/cmdline.txt', '/boot/firmware/cmdline.txt') }}" - name: Activating cgroup support lineinfile: