Merge branch 'master' into raspbian-cgroups-fix

Add check and variable so that we write to the correct file
Fix cgroups cmdline path
2026-03-11 23:32:12 +01:00 · 2024-02-24 21:26:40 -05:00 · 2024-02-24 21:25:55 -05:00 · 2024-02-24 16:53:51 -05:00
1 changed files with 11 additions and 1 deletions
--- 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/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
Author	SHA1	Message	Date
Daniel SP	0919571744	Merge branch 'master' into raspbian-cgroups-fix	2024-02-24 21:26:40 -05:00
Daniel San Pedro	7db9f5bd9b	Add check and variable so that we write to the correct file	2024-02-24 21:25:55 -05:00
Daniel San Pedro	842bfd8de9	Fix cgroups cmdline path	2024-02-24 16:53:51 -05:00