diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-03-09 04:37:29 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-03-09 04:37:29 +0100 |
| commit | 2f548a512345e9208991219443315df305724997 (patch) | |
| tree | a996a155bdcf142a2cae319231cf1fcd67e2789f /roles/raspios/image/tasks | |
| parent | add ch-zimablade (diff) | |
raspios: add support for bookworm
Diffstat (limited to 'roles/raspios/image/tasks')
| -rw-r--r-- | roles/raspios/image/tasks/fetch.yml | 7 | ||||
| -rw-r--r-- | roles/raspios/image/tasks/main.yml | 14 |
2 files changed, 7 insertions, 14 deletions
diff --git a/roles/raspios/image/tasks/fetch.yml b/roles/raspios/image/tasks/fetch.yml index b9294415..c58b647c 100644 --- a/roles/raspios/image/tasks/fetch.yml +++ b/roles/raspios/image/tasks/fetch.yml @@ -7,12 +7,15 @@ - name: fetch imageutility os list from download server check_mode: no uri: - url: "{{ raspios_download_url }}/os_list_imagingutility_v3.json" + url: "{{ raspios_download_url }}/os_list_imagingutility_v4.json" body_format: json register: raspios_os_list_imagingutility - set_fact: - raspios_download_url_image: "{{ raspios_os_list_imagingutility.json.os_list | raspios_extract_latest_image_download_url(raspios_download_base_url) }}" + raspios_download_url_image: "{{ raspios_os_list_imagingutility.json.os_list | raspios_extract_latest_image_download_url(raspios_variant, raspios_codename, raspios_arch) }}" + +- debug: + var: raspios_download_url_image - name: download the raspios image block: diff --git a/roles/raspios/image/tasks/main.yml b/roles/raspios/image/tasks/main.yml index b6a56bd2..b8296f9a 100644 --- a/roles/raspios/image/tasks/main.yml +++ b/roles/raspios/image/tasks/main.yml @@ -5,16 +5,6 @@ that: - "'raspios' in group_names" -- name: fetch os list from download server - check_mode: no - uri: - url: "{{ raspios_download_url }}/os_list_v3.json" - body_format: json - register: raspios_os_list - -- set_fact: - raspios_download_base_url: "{{ raspios_os_list.json.os_list | raspios_extract_download_base_url(raspios_variant, raspios_codename, raspios_arch) }}" - - name: fetch base image run_once: true import_tasks: fetch.yml @@ -83,9 +73,9 @@ - name: edit boot/cmdline.txt lineinfile: path: "{{ raspios_image_mount_point }}/cmdline.txt" - regexp: '^(.*)( systemd.run=/boot/firstrun.sh systemd.run_success_action=reboot systemd.unit=kernel-command-line.target)?(.*?)$' + regexp: '^(.*)( systemd.run=/boot/firstrun.sh systemd.run_success_action=reboot systemd.run_failure_action=none systemd.unit=kernel-command-line.target)?(.*?)$' backrefs: yes - line: '\1 systemd.run=/boot/firstrun.sh systemd.run_success_action=reboot systemd.unit=kernel-command-line.target \3' + line: '\1 systemd.run=/boot/firstrun.sh systemd.run_success_action=reboot systemd.run_failure_action=none systemd.unit=kernel-command-line.target \3' always: - name: unmount image |