From 94a5c548dd3b1409b562f7efaaa68b28a50415ab Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 10 Sep 2022 18:59:12 +0200 Subject: fix apt-repo handling and raspios image for armhf based installs --- roles/apt-repo/base/defaults/main.yml | 3 +++ roles/apt-repo/base/tasks/main.yml | 2 +- roles/apt-repo/base/templates/Raspbian.list.j2 | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 roles/apt-repo/base/templates/Raspbian.list.j2 (limited to 'roles/apt-repo') diff --git a/roles/apt-repo/base/defaults/main.yml b/roles/apt-repo/base/defaults/main.yml index 418bc13f..0cab41a8 100644 --- a/roles/apt-repo/base/defaults/main.yml +++ b/roles/apt-repo/base/defaults/main.yml @@ -5,3 +5,6 @@ apt_repo_base_components: - universe debian: - main + raspbian: + - main + - rpi diff --git a/roles/apt-repo/base/tasks/main.yml b/roles/apt-repo/base/tasks/main.yml index e08029ea..22084941 100644 --- a/roles/apt-repo/base/tasks/main.yml +++ b/roles/apt-repo/base/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: install global sources.list template: - src: "{{ ansible_distribution }}.list.j2" + src: "{{ ansible_lsb.id | default(ansible_distribution) }}.list.j2" dest: /etc/apt/sources.list register: apt_repo_base_sources diff --git a/roles/apt-repo/base/templates/Raspbian.list.j2 b/roles/apt-repo/base/templates/Raspbian.list.j2 new file mode 100644 index 00000000..0022470a --- /dev/null +++ b/roles/apt-repo/base/templates/Raspbian.list.j2 @@ -0,0 +1 @@ +deb http://{{ apt_repo_providers[apt_repo_provider].raspbian.host }}{{ apt_repo_providers[apt_repo_provider].raspbian.path }} {{ ansible_distribution_release }} {{ apt_repo_components | default(apt_repo_base_components.raspbian) | join(' ') }} -- cgit v1.2.3