Minor fixes to raspberry config and playbook configs

8 files changed, 22 insertions, 18 deletions

diff --git a/host_vars/archiso.local.yml.example b/host_vars/archiso.local.yml.example
index 0dd53e7..b1631f9 100644
--- a/host_vars/archiso.local.yml.example
+++ b/host_vars/archiso.local.yml.example
@@ -43,4 +43,3 @@ partition_extras:
     part_end: "100%"
     fstype: "ext4"
     dev: "{{ partition_disk }}4"
-configure_playbook_dir: "../ansible-distro-configure"
diff --git a/host_vars/raspberryiso.local.yml.example b/host_vars/raspberryiso.local.yml.example
index 6a98993..151d687 100644
--- a/host_vars/raspberryiso.local.yml.example
+++ b/host_vars/raspberryiso.local.yml.example
@@ -22,4 +22,3 @@ partition_root:
   dev: "{{ partition_disk }}p2"
   mount_path: "/mnt"
 partition_extras: []
-configure_playbook_dir: "../ansible-distro-configure"
diff --git a/host_vars/ubuntuiso.local.yml.example b/host_vars/ubuntuiso.local.yml.example
index 00f1c52..6b8c6c1 100644
--- a/host_vars/ubuntuiso.local.yml.example
+++ b/host_vars/ubuntuiso.local.yml.example
@@ -44,4 +44,3 @@ partition_extras:
     fstype: "ext4"
     dev: "{{ partition_disk }}5"
     mount_path: "/mnt/home"
-configure_playbook_dir: "../ansible-distro-configure"
diff --git a/molecule/default/Dockerfile.archlinux.j2 b/molecule/default/Dockerfile.archlinux.j2
index 177724d..b4db47c 100644
--- a/molecule/default/Dockerfile.archlinux.j2
+++ b/molecule/default/Dockerfile.archlinux.j2
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 docker.io/library/archlinux
+FROM docker.io/library/archlinux
 
 ENV container docker
 
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index c9f5f8d..e4fa13a 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,8 +8,8 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: ${MOLECULE_DISTRO:-archlinux}
-    dockerfile: Dockerfile.${MOLECULE_DISTRO:-archlinux}.j2
+    image: "${MOLECULE_DISTRO:-archlinux}"
+    dockerfile: "Dockerfile.${MOLECULE_DISTRO:-archlinux}.j2"
     platform: "${MOLECULE_PLATFORM:-linux/amd64}"
     pre_build_image: false
     privileged: true
diff --git a/roles/bootstrap/meta/main.yml b/roles/bootstrap/meta/main.yml
index 0e6a4ce..c3d2b3d 100644
--- a/roles/bootstrap/meta/main.yml
+++ b/roles/bootstrap/meta/main.yml
@@ -15,3 +15,6 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - noble
+    - name: Debian
+      versions:
+        - bookworm
diff --git a/roles/bootstrap/templates/raspberry.config.j2 b/roles/bootstrap/templates/raspberry.config.j2
index f4c1b40..def13e0 100644
--- a/roles/bootstrap/templates/raspberry.config.j2
+++ b/roles/bootstrap/templates/raspberry.config.j2
@@ -1,17 +1,18 @@
-[pi5]
-kernel=kernel_2712.img
-dtparam=pciex1
-dtparam=pciex1_gen=2
-
-[all]
+dtparam=audio=on
+camera_auto_detect=1
+display_auto_detect=1
+auto_initramfs=1
+dtoverlay=vc4-kms-v3d
+max_framebuffers=2
+disable_fw_kms_setup=1
 arm_64bit=1
+disable_overscan=1
 arm_boost=1
 
-disable_overscan=1
-disable_fw_kms_setup=1
+[cm4]
+otg_mode=1
 
-camera_auto_detect=0
-display_auto_detect=0
-dtparam=audio=on
+[cm5]
+dtoverlay=dwc2,dr_mode=host
 
-auto_initramfs=1
+[all]
diff --git a/roles/configure/meta/main.yml b/roles/configure/meta/main.yml
index 97ee720..e1939a7 100644
--- a/roles/configure/meta/main.yml
+++ b/roles/configure/meta/main.yml
@@ -14,3 +14,6 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - noble
+    - name: Debian
+      versions:
+        - bookworm