diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-01-17 23:52:56 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-01-17 23:52:56 +0100 |
| commit | 01484543e984105d8b2fa478d0f1936d4766e8c3 (patch) | |
| tree | e6213828143064221b1324f61b7b711004be0949 | |
| parent | sk-tomnext-nc: increase opcache memory limit for nextcloud (diff) | |
fix vm-install for kali
| -rw-r--r-- | roles/installer/debian/base/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/vm/guest/create/templates/libvirt-domain.xml.j2 | 2 | ||||
| -rw-r--r-- | roles/vm/guest/install/tasks/main.yml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/roles/installer/debian/base/tasks/main.yml b/roles/installer/debian/base/tasks/main.yml index 56ca7dc0..fdc04119 100644 --- a/roles/installer/debian/base/tasks/main.yml +++ b/roles/installer/debian/base/tasks/main.yml @@ -21,3 +21,8 @@ copy: src: "{{ global_files_dir }}/common/keyrings/ubuntu-archive.gpg" dest: "{{ installer_base_path }}/keyrings/ubuntu-archive.gpg" + +- name: copy kali archive keyring file + copy: + src: "{{ global_files_dir }}/common/keyrings/kali-archive.gpg" + dest: "{{ installer_base_path }}/keyrings/kali-archive.gpg" diff --git a/roles/vm/guest/create/templates/libvirt-domain.xml.j2 b/roles/vm/guest/create/templates/libvirt-domain.xml.j2 index 04905c72..e578e0f8 100644 --- a/roles/vm/guest/create/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/create/templates/libvirt-domain.xml.j2 @@ -19,7 +19,7 @@ {% endif %} <type machine='q35'>hvm</type> {% if vm_create_installer %} -{% if install_distro == 'debian' or install_distro == 'ubuntu' %} +{% if install_distro == 'debian' or install_distro == 'ubuntu' or install_distro == 'kali' %} <kernel>{{ installer_tmpdir }}/linux</kernel> <initrd>{{ installer_tmpdir }}/initrd.gz</initrd> <cmdline>console=ttyS0,115200n8 auto</cmdline> diff --git a/roles/vm/guest/install/tasks/main.yml b/roles/vm/guest/install/tasks/main.yml index ce9a8c4a..6a61b787 100644 --- a/roles/vm/guest/install/tasks/main.yml +++ b/roles/vm/guest/install/tasks/main.yml @@ -41,7 +41,7 @@ state: directory register: tmpdir - - when: install_distro in ['debian', 'ubuntu'] + - when: install_distro in ['debian', 'ubuntu', 'kali'] include_tasks: installer-debian.yml - when: install_distro in ['openbsd'] |