From 7ff35ec95420023d323e394162cd124029ea7161 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 20 Jul 2020 22:34:01 +0200 Subject: make debian installer fetch more generic --- roles/installer/debian/fetch/vars/main.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'roles/installer/debian/fetch/vars/main.yml') diff --git a/roles/installer/debian/fetch/vars/main.yml b/roles/installer/debian/fetch/vars/main.yml index 404b571a..f612a742 100644 --- a/roles/installer/debian/fetch/vars/main.yml +++ b/roles/installer/debian/fetch/vars/main.yml @@ -1,13 +1,18 @@ --- -debian_installer_base_url: "{{ debian_installer_url[debian_installer_distro] }}/dists/{{ debian_installer_codename }}/main/installer-{{ debian_installer_arch }}/current/{{ [debian_installer_distro, debian_installer_codename] | di_images_path }}" +debian_installer_base_url: "{{ debian_installer_url[debian_installer_distro] }}/dists/{{ [debian_installer_distro, debian_installer_codename] | di_dists_path }}/main/installer-{{ debian_installer_arch }}/current/{{ [debian_installer_distro, debian_installer_codename] | di_images_path }}" _debian_installer_variant_path_: netboot: "netboot/{{ debian_installer_distro }}-installer/{{ debian_installer_arch }}" hd-media: "hd-media" -_debian_installer_variant_kernel_image_name_: - netboot: "linux" - hd-media: "vmlinuz" +_debian_installer_variant_files_: + netboot: + - linux + - initrd.gz + hd-media: + - linux + - initrd.gz debian_installer_variant_path: "{{ _debian_installer_variant_path_[debian_installer_variant] }}" -debian_installer_variant_kernal_image_name: "{{ _debian_installer_variant_kernel_image_name_[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 }}" -- cgit v1.2.3 From f6afeeca8982960988bf965193c33038cef6be2b Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 20 Jul 2020 22:58:48 +0200 Subject: fix debian installer fetch variant hd-media --- roles/installer/debian/fetch/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/installer/debian/fetch/vars/main.yml') diff --git a/roles/installer/debian/fetch/vars/main.yml b/roles/installer/debian/fetch/vars/main.yml index f612a742..0f4f3f45 100644 --- a/roles/installer/debian/fetch/vars/main.yml +++ b/roles/installer/debian/fetch/vars/main.yml @@ -10,7 +10,7 @@ _debian_installer_variant_files_: - linux - initrd.gz hd-media: - - linux + - vmlinuz - initrd.gz debian_installer_variant_path: "{{ _debian_installer_variant_path_[debian_installer_variant] }}" -- cgit v1.2.3 From 5bbc9ab278714aec8e4d5419b9ef9028f684820a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 20 Jul 2020 23:06:15 +0200 Subject: debian installer fetch: add support for mini.iso download --- roles/installer/debian/fetch/vars/main.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'roles/installer/debian/fetch/vars/main.yml') diff --git a/roles/installer/debian/fetch/vars/main.yml b/roles/installer/debian/fetch/vars/main.yml index 0f4f3f45..989fc305 100644 --- a/roles/installer/debian/fetch/vars/main.yml +++ b/roles/installer/debian/fetch/vars/main.yml @@ -4,6 +4,7 @@ debian_installer_base_url: "{{ debian_installer_url[debian_installer_distro] }}/ _debian_installer_variant_path_: netboot: "netboot/{{ debian_installer_distro }}-installer/{{ debian_installer_arch }}" hd-media: "hd-media" + mini-iso: "netboot" _debian_installer_variant_files_: netboot: @@ -12,6 +13,8 @@ _debian_installer_variant_files_: hd-media: - vmlinuz - initrd.gz + mini-iso: + - mini.iso debian_installer_variant_path: "{{ _debian_installer_variant_path_[debian_installer_variant] }}" debian_installer_variant_files: "{{ _debian_installer_variant_files_[debian_installer_variant] }}" -- cgit v1.2.3