From f3361877525e523481a89c4bb60db8178103ad1e Mon Sep 17 00:00:00 2001
From: "Pietsch, Martin" <martin.pietsch@tu-dresden.de>
Date: Fri, 4 Oct 2019 13:42:39 +0200
Subject: [PATCH] integrated variables system_installer_images
---
tasks/_mergeimages.yml | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/tasks/_mergeimages.yml b/tasks/_mergeimages.yml
index 3a3b81a..2640ef6 100644
--- a/tasks/_mergeimages.yml
+++ b/tasks/_mergeimages.yml
@@ -3,24 +3,38 @@
set_fact:
_linux_installer_arch: "x86_64"
_linux_installer_corefile: "corepure64.gz"
+ _linux_installer_kernelfile: "vmlinuz64"
when: _linux_dist_arch == "x86_64" or _linux_dist_arch == "amd64"
- set_fact:
_linux_installer_arch: "x86"
_linux_installer_corefile: "core.gz"
+ _linux_installer_kernelfile: "vmlinuz"
when: _linux_dist_arch == "x86" or (_linux_dist_arch | regex_search('i[0-9]86'))
-- name: download tiny core linux imagefs file
+- name: download tiny core linux image file
get_url:
url: "{{ '%s/%s/%s/release/distribution_files/%s' | format(linux_installer_home_mirror, linux_installer_version, _linux_installer_arch, _linux_installer_corefile) }}"
dest: "{{ '/tmp/%s' | format(_linux_installer_corefile) }}"
+- name: download tiny core linux kernel file
+ get_url:
+ url: "{{ '%s/%s/%s/release/distribution_files/%s' | format(linux_installer_home_mirror, linux_installer_version, _linux_installer_arch, _linux_installer_kernelfile) }}"
+ dest: "{{ '/tmp/%s' | format(_linux_installer_kernelfile) }}"
+
- name: merge tiny core image with installer image
shell: "{{ 'cat /tmp/%s %s >/tmp/linux_%s_%s.gz' | format(_linux_installer_corefile, _linux_installer_image_file.path, linux_installer_distribution, _linux_dist_arch) }}"
-- name: register install image
- include_role:
- name: package.pxelinux
- tasks_from: registerimage
- vars:
- pxelinux_image_buildpath: "{{ '%s/mfsbsd-%s-RELEASE-%s.img' | format(mfsbsdroot, distdata[1], distdata[0]) }}" pxelinux_image_distribution: "freebsd" pxelinux_image_release: "{{ distdata[1] }}" pxelinux_image_architecture: "{{ distdata[0] }}"
+- name: save images for registration
+ set_fact:
+ system_installer_images: >-
+ {%- set retval = namespace(data = []) -%}
+ {%- if system_installer_images is defined -%}
+ {%- set retval.data = system_installer_images -%}
+ {%- endif -%}
+ {%- do retval.data.append(['/tmp/linux_%s_%s.gz' | format(linux_installer_distribution, _linux_dist_arch), '/tmp/%s' | format(_linux_installer_kernelfile),
+ linux_installer_distribution, _linux_dist_release, _linux_dist_arch]) -%}
+ {{- retval.data -}}
+ loop: "{{ system_supported_releases[linux_installer_distribution] }}"
+ loop_control:
+ loop_var: _linux_dist_release
--
GitLab