diff options
Diffstat (limited to 'roles/vm/guest')
-rw-r--r-- | roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 4 | ||||
-rw-r--r-- | roles/vm/guest/install/tasks/installer-debian.yml | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index ba0dcd5a..bbca0fea 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -7,8 +7,8 @@ <type arch='x86_64' machine='pc-0.12'>hvm</type> {% if vm_define_installer %} {% if install_distro == 'debian' or install_distro == 'ubuntu' %} - <kernel>{{ installer_base_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}-netboot/linux</kernel> - <initrd>{{ installer_tmpdir }}/initrd.{{ install_hostname }}.gz</initrd> + <kernel>{{ installer_tmpdir }}/linux</kernel> + <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 32662f8c..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: "{{ installer_base_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}-netboot/initrd.gz" + preseed_initrd: "{{ tmpdir.path }}/initrd.gz" preseed_tmpdir: "{{ tmpdir.path }}" preseed_virtual_machine: yes preseed_force_net_ifnames_policy: path |