diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-07-20 22:51:24 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-07-20 22:51:24 +0200 |
| commit | a367366bfe3397b52b1fa286be8877cd23d2b657 (patch) | |
| tree | 92947ad5096a378a10cb0347a4d04f5504d7f4a2 /roles/vm/guest | |
| parent | make debian installer fetch more generic (diff) | |
simpler pressed initrd handling
Diffstat (limited to 'roles/vm/guest')
| -rw-r--r-- | roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 2 | ||||
| -rw-r--r-- | roles/vm/guest/install/tasks/installer-debian.yml | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index f2b0cfe8..bbca0fea 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -8,7 +8,7 @@ {% if vm_define_installer %} {% if install_distro == 'debian' or install_distro == 'ubuntu' %} <kernel>{{ installer_tmpdir }}/linux</kernel> - <initrd>{{ installer_tmpdir }}/initrd.{{ install_hostname }}.gz</initrd> + <initrd>{{ installer_tmpdir }}/initrd.gz</initrd> <cmdline>console=ttyS0,115200n8 DEBCONF_DEBUG=5</cmdline> <boot dev='hd'/> {% elif install_distro == 'openbsd' %} diff --git a/roles/vm/guest/install/tasks/installer-debian.yml b/roles/vm/guest/install/tasks/installer-debian.yml index c89a1cdf..b0bc6e9e 100644 --- a/roles/vm/guest/install/tasks/installer-debian.yml +++ b/roles/vm/guest/install/tasks/installer-debian.yml @@ -8,9 +8,18 @@ import_role: name: installer/debian/fetch +- name: copy the installer files to the temporary installer directory + loop: + - linux + - initrd.gz + copy: + remote_src: yes + src: "{{ debian_installer_target_dir }}/{{ item }}" + dest: "{{ tmpdir.path }}/{{ item }}" + - name: generate host specific initial ramdisk vars: - preseed_orig_initrd: "{{ debian_installer_target_dir }}/initrd.gz" + preseed_initrd: "{{ tmpdir.path }}/initrd.gz" preseed_tmpdir: "{{ tmpdir.path }}" preseed_virtual_machine: yes preseed_force_net_ifnames_policy: path @@ -18,9 +27,3 @@ install_interface: enp1s1 import_role: name: installer/debian/preseed - -- name: copy installer kernel image to temporary installer directory - copy: - remote_src: yes - src: "{{ debian_installer_target_dir }}/linux" - dest: "{{ tmpdir.path }}/linux |