diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-10-29 02:00:58 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-10-29 02:00:58 +0200 |
| commit | a16da9b55b796a4d2246314fb056f358f9baef15 (patch) | |
| tree | 2baeaf880ebcf26b9e2fb396ac7aa489cdbf1ea1 /roles/installer/debian/usb | |
| parent | Merge branch 'topic/kali-linux' (diff) | |
debian-installer: proper support hd-media varant for usb
Diffstat (limited to 'roles/installer/debian/usb')
| -rw-r--r-- | roles/installer/debian/usb/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/installer/debian/usb/templates/syslinux.cfg.j2 | 2 | ||||
| -rw-r--r-- | roles/installer/debian/usb/vars/main.yml | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/roles/installer/debian/usb/tasks/main.yml b/roles/installer/debian/usb/tasks/main.yml index 6beb0121..13219b8c 100644 --- a/roles/installer/debian/usb/tasks/main.yml +++ b/roles/installer/debian/usb/tasks/main.yml @@ -63,10 +63,17 @@ path: "{{ tmpdir.path }}" state: absent +- name: remove stale linux kernel image files + loop: "{{ debian_installer_usb_kernel_images_stale }}" + run_once: true + file: + path: "{{ usb_install_path }}/{{ item }}" + state: absent + - name: copy linux kernel image to the USB drive run_once: true copy: - src: "{{ debian_installer_target_dir }}/linux" + src: "{{ debian_installer_target_dir }}/{{ debian_installer_kernel_image }}" dest: "{{ usb_install_path }}/" - name: generate syslinux configuration diff --git a/roles/installer/debian/usb/templates/syslinux.cfg.j2 b/roles/installer/debian/usb/templates/syslinux.cfg.j2 index 79c9d78e..ec6ddcb6 100644 --- a/roles/installer/debian/usb/templates/syslinux.cfg.j2 +++ b/roles/installer/debian/usb/templates/syslinux.cfg.j2 @@ -19,7 +19,7 @@ MENU TITLE {{ install_distro }} / {{ install_codename }} LABEL {{ host }} MENU LABEL automated installer for {{ host }} - KERNEL linux + KERNEL {{ debian_installer_kernel_image }} INITRD initrd.{{ host }}.gz APPEND auto fb=false {{ (hostvars[host].install.kernel_cmdline | default([])) | join(' ') }} {% endfor %} diff --git a/roles/installer/debian/usb/vars/main.yml b/roles/installer/debian/usb/vars/main.yml new file mode 100644 index 00000000..de222269 --- /dev/null +++ b/roles/installer/debian/usb/vars/main.yml @@ -0,0 +1,2 @@ +--- +debian_installer_usb_kernel_images_stale: "{{ _debian_installer_kernel_image_ | dict2items | map(attribute='value') | unique | difference(debian_installer_kernel_image) | list }}" |