diff options
author | Christian Pointner <equinox@spreadspace.org> | 2020-07-11 01:42:07 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2020-07-11 01:42:07 +0200 |
commit | c188d4ac1713506c3028b4501730713cfda0ed36 (patch) | |
tree | e056a15d599981f963f20365848d4032aa792191 /roles/vm/define | |
parent | preseed/partman: nicer error text for not-enough-space (diff) | |
parent | openbsd installer: improve image verification (diff) |
Merge branch 'topic/debian-installer-verification'
Diffstat (limited to 'roles/vm/define')
-rw-r--r-- | roles/vm/define/templates/libvirt-domain.xml.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2 index c4c9e52a..ba0dcd5a 100644 --- a/roles/vm/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/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_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}/linux</kernel> - <initrd>{{ preseed_tmpdir }}/initrd.preseed.gz</initrd> + <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> <cmdline>console=ttyS0,115200n8 DEBCONF_DEBUG=5</cmdline> <boot dev='hd'/> {% elif install_distro == 'openbsd' %} @@ -44,7 +44,7 @@ {% if vm_define_installer and install_distro == 'openbsd' %} <disk type='file' device='cdrom'> <driver name='qemu'/> - <source file='{{ obsd_autoinstall_tmpdir }}/install.iso'/> + <source file='{{ installer_tmpdir }}/{{ install_hostname }}.iso'/> <target dev='hdc' bus='ide'/> <readonly/> </disk> |