From 2adc2bd0b5cca01e1a0883a956fe607fc8d4d675 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sun, 13 Aug 2023 09:53:58 +0300
Subject: fix(v-i, std.yml): always set the Ansible variable debian_release

Also enable the non-free components on bullseye, for wifi firmware.

Sponsored-by: author
---
 std.yml | 11 +++++++++--
 v-i     |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/std.yml b/std.yml
index 08724a9..a69b6bb 100644
--- a/std.yml
+++ b/std.yml
@@ -116,10 +116,17 @@
         name: ifupdown
         state: absent
 
-    - name: "enable the non-free-firmware component on bookworm"
+    - name: "enable the non-free-firmware component"
       when: debian_release != "bullseye"
       apt_repository:
-        repo: "deb http://deb.debian.org/debian {{ debian_release}} non-free-firmware"
+        repo: "deb http://deb.debian.org/debian {{ debian_release }} non-free-firmware"
+        state: present
+        update_cache: yes
+
+    - name: "enable the non-free component"
+      when: debian_release == "bullseye"
+      apt_repository:
+        repo: "deb http://deb.debian.org/debian {{ debian_release }} non-free"
         state: present
         update_cache: yes
 
diff --git a/v-i b/v-i
index 96b76e6..4430918 100755
--- a/v-i
+++ b/v-i
@@ -549,8 +549,8 @@ def main():
         log(f"reading Ansible vars from {filename}")
         with open(filename) as f:
             vars_dict = yaml.safe_load(f)
-        vars_dict["debian_release"] = system.debian_release
         ansible_vars.update(vars_dict)
+    ansible_vars["debian_release"] = system.debian_release
     ansible_vars_json = json.dumps(ansible_vars, indent=4)
     log(f"ansible_vars:\n{ansible_vars_json}")
     timings.reached("read configuration")
-- 
cgit v1.2.1