diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2023-07-30 23:34:43 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2023-07-30 23:34:43 +0200 |
| commit | d5f62343d3e1a171600bc604fe480b2b0db2d19a (patch) | |
| tree | 6c9e37deec17fe77759352148a26d4850169b205 /roles | |
| parent | add syncoid backup job for ch-equinox-ws (diff) | |
somre more fixes for updated ansible
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/installer/debian/fetch/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/installer/debian/fetch/vars/main.yml | 1 | ||||
| -rw-r--r-- | roles/raspios/image/tasks/main.yml | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/roles/installer/debian/fetch/tasks/main.yml b/roles/installer/debian/fetch/tasks/main.yml index b0dd59a5..1fbd9606 100644 --- a/roles/installer/debian/fetch/tasks/main.yml +++ b/roles/installer/debian/fetch/tasks/main.yml @@ -1,4 +1,8 @@ --- +- name: compute target directory + set_fact: + debian_installer_target_dir: "{{ installer_base_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}" + - name: prepare directories for installer files file: name: "{{ debian_installer_target_dir }}" diff --git a/roles/installer/debian/fetch/vars/main.yml b/roles/installer/debian/fetch/vars/main.yml index bab96029..b703513e 100644 --- a/roles/installer/debian/fetch/vars/main.yml +++ b/roles/installer/debian/fetch/vars/main.yml @@ -24,4 +24,3 @@ _debian_installer_variant_files_: debian_installer_variant_path: "{{ _debian_installer_variant_path_[debian_installer_variant] }}" debian_installer_kernel_image: "{{ _debian_installer_kernel_image_[debian_installer_variant] }}" debian_installer_variant_files: "{{ _debian_installer_variant_files_[debian_installer_variant] }}" -debian_installer_target_dir: "{{ installer_base_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}" diff --git a/roles/raspios/image/tasks/main.yml b/roles/raspios/image/tasks/main.yml index e7e0cbba..b6a56bd2 100644 --- a/roles/raspios/image/tasks/main.yml +++ b/roles/raspios/image/tasks/main.yml @@ -55,7 +55,7 @@ register: raspios_image_mount - set_fact: - raspios_image_mount_point: "{{ raspios_image_mount.stdout | regex_search('at (/media/.+)\\.$', '\\1') | first }}" + raspios_image_mount_point: "{{ raspios_image_mount.stdout | regex_search('at (/media/.+)\\.?$', '\\1') | first }}" - name: edit boot/config.txt when: raspios_boot_config is defined |