From 95cb2e5b6d827764f139a9c8c4f867f9f9f72d42 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Fri, 1 Dec 2023 16:33:56 +0000
Subject: [PATCH] Fix components in bookworm+ sources.list
Add non-free-firmware.
---
roles/float-base/tasks/apt.yml | 9 +++++++++
roles/float-base/templates/sources.list.j2 | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/roles/float-base/tasks/apt.yml b/roles/float-base/tasks/apt.yml
index e73754ca..2d4b7c22 100644
--- a/roles/float-base/tasks/apt.yml
+++ b/roles/float-base/tasks/apt.yml
@@ -45,6 +45,15 @@
- "deb http://deb.autistici.org/urepo ai3/"
- "deb http://deb.autistici.org/urepo buster-podman/"
+- set_fact:
+ apt_debian_components:
+ - main
+ - contrib
+ - non-free
+- set_fact:
+ apt_debian_components: "{{ apt_debian_components + ['non-free-firmware'] }}"
+ when: "float_debian_dist not in ('buster', 'bullseye')"
+
- name: Install our standard sources.list
template:
src: "sources.list.j2"
diff --git a/roles/float-base/templates/sources.list.j2 b/roles/float-base/templates/sources.list.j2
index 939e9edc..dc0a5c63 100644
--- a/roles/float-base/templates/sources.list.j2
+++ b/roles/float-base/templates/sources.list.j2
@@ -1,5 +1,5 @@
{% if apt_sources_list_override is defined %}{{ apt_sources_list_override }}{% else %}
-deb http://deb.debian.org/debian {{ float_debian_dist }} main contrib non-free
-deb http://deb.debian.org/debian {{ float_debian_dist }}-updates main contrib non-free
-deb http://security.debian.org/debian-security {{ float_debian_dist }}-security main contrib non-free
+deb http://deb.debian.org/debian {{ float_debian_dist }} {{ apt_debian_components | join(' ') }}
+deb http://deb.debian.org/debian {{ float_debian_dist }}-updates {{ apt_debian_components | join(' ') }}
+deb http://security.debian.org/debian-security {{ float_debian_dist }}-security {{ apt_debian_components | join(' ') }}
{% endif %}
--
GitLab