From 1ed3ab7e238154b30780b32b035fbe2d4092b21b Mon Sep 17 00:00:00 2001 From: nd Date: Fri, 8 Mar 2024 13:43:49 +0100 Subject: [PATCH] fix raspbian bookworm --- defaults/main.yml | 10 +++++++++- tasks/main.yml | 7 +++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4a37755..0969bfe 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -28,7 +28,11 @@ default_repos: backports: url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free" raspbian: - bookworm: {} + bookworm: + raspbian: + url: "deb http://raspbian.raspberrypi.org/raspbian/ {{ ansible_distribution_release|lower }} main contrib non-free rpi" + debian: + url: "deb http://archive.raspberrypi.org/debian/ {{ ansible_distribution_release|lower }} main non-free" bullseye: {} buster: {} @@ -80,3 +84,7 @@ default_packages: zsh: {} bullseye: *debian_packages buster: *debian_packages + raspbian: + bookworm: *debian_packages + bullseye: *debian_packages + buster: *debian_packages diff --git a/tasks/main.yml b/tasks/main.yml index 8957ada..a44023c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,11 +1,14 @@ --- +- name: workaround for raspbian naming + set_fact: + package_distro: "{% if ansible_lsb.id == 'Raspbian' %}raspbian{% else %}{{ ansible_distribution|lower }}{% endif %}" - name: install default packages and repos include_role: name: packages vars: packages: - pkg: "{{ default_packages[ansible_distribution|lower][ansible_distribution_release|lower] }}" - repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}" + pkg: "{{ default_packages[package_distro][ansible_distribution_release|lower] }}" + repos: "{{ default_repos[package_distro][ansible_distribution_release|lower] }}" - name: copy environment copy: