diff options
author | Lars Wirzenius <liw@liw.fi> | 2023-08-13 09:53:58 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2023-08-13 09:53:58 +0300 |
commit | 2adc2bd0b5cca01e1a0883a956fe607fc8d4d675 (patch) | |
tree | eda39559864b7c162e274370e30eeaf6f929c7bf | |
parent | a9d2cea28f829c54bd941235efbf8e6558baf8dc (diff) | |
download | v-i-2adc2bd0b5cca01e1a0883a956fe607fc8d4d675.tar.gz |
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
-rw-r--r-- | std.yml | 11 | ||||
-rwxr-xr-x | v-i | 2 |
2 files changed, 10 insertions, 3 deletions
@@ -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 @@ -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") |