Further uefi and boot.ipxe fixes
Removed more Debian 10 items that were missed
Updated Debian 11 checksums
Change-Id: Ide5d2b4b5d79ce5f4113d4e66e73c24c53114e93
diff --git a/defaults/main.yml b/defaults/main.yml
index 5033b82..54e61d4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -35,45 +35,25 @@
pxeboot_syslinux_version: "5.10"
pxeboot_syslinux_checksum: "sha256:d9cd7727bfed2c0ca5bf07bb3d213286e014a78e92a6a89ac32eb906d6b7ab3f"
-# Debian 10 image
-pxeboot_debian10_base_url: "https://deb.debian.org/debian/dists/buster/main/installer-amd64"
-pxeboot_debian10_version: "20190702+deb10u11/images/netboot/debian-installer/amd64/"
-
-# checksums from version as of 2021-11-27
-pxeboot_debian10_files:
- - name: "linux"
- checksum: "sha256:8c8a24cf5d65c33c2675d4226dea4f8412c9cfc2046f50ba440e037b47465147"
- - name: "initrd.gz"
- checksum: "sha256:b6b59929f3fcc1d55d16e573a063e403855ead009343117f36c022b7bff00edf"
-
-pxeboot_debian10_linux_args: ""
-
-pxeboot_debian10_nonfree_url: "http://cdimage.debian.org/cdimage/unofficial/non-free/"
-
-pxeboot_debian10_nonfree_files:
- - path: "firmware/buster/20211009"
- name: "firmware.cpio.gz"
- checksum: "sha256:a9743d56e877888a6984fd52e95192b0f97c908344bdee69c18e072325b8d4e4"
-
# Debian 11 image
pxeboot_debian11_base_url: "https://deb.debian.org/debian/dists/bullseye/main/installer-amd64"
-pxeboot_debian11_version: "20210731+deb11u3/images/netboot/debian-installer/amd64/"
+pxeboot_debian11_version: "20210731+deb11u4/images/netboot/debian-installer/amd64/"
-# checksums from version as of 2021-11-27
+# checksums from version as of 2022-06-20
pxeboot_debian11_files:
- name: "linux"
- checksum: "sha256:b8e18400ca9c268334c2c1d5a911c2c1f4f522480a23bcaba1798b5c810edeea"
+ checksum: "sha256:c5500987889bca74fc457541fec9b55b8b6092827032821d3e351e84dcb04ff2"
- name: "initrd.gz"
- checksum: "sha256:f8892c6b79817257a05a6d947be00ded56dbec057dff961dd1f526b0ab325320"
+ checksum: "sha256:b16c4b475b27c9fd8abdf68d5dec6fb0107cb6645d8f75613ff54cf6fd829abc"
pxeboot_debian11_linux_args: ""
pxeboot_debian11_nonfree_url: "http://cdimage.debian.org/cdimage/unofficial/non-free/"
pxeboot_debian11_nonfree_files:
- - path: "firmware/bullseye/20220326"
+ - path: "firmware/bullseye/20220709"
name: "firmware.cpio.gz"
- checksum: "sha256:0b4a8e6f8704ab3225946087b0af8b0bedceea9f8a3d28bda5151dccecf94c37"
+ checksum: "sha256:290989bb6d96420f95bcc0c993c462b9cace2afaaf872feb7f00a2ac299ebfe1"
# Ubuntu 18.04 image
pxeboot_ubuntu1804_base_url: "http://archive.ubuntu.com/ubuntu/dists/bionic-updates/main/installer-amd64"
diff --git a/tasks/debian10.yml b/tasks/debian10.yml
deleted file mode 100644
index 7a520ba..0000000
--- a/tasks/debian10.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-# pxeboot tasks/debian10.yml
-#
-# SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
-# SPDX-License-Identifier: Apache-2.0
-
-- name: Create debian10 dir in webroot
- file:
- state: directory
- path: "{{ pxeboot_web_root }}/debian10"
- owner: "{{ pxeboot_username }}"
- group: "{{ pxeboot_groupname }}"
- mode: "0755"
-
-- name: Download debian10 base files
- get_url:
- url: "{{ pxeboot_debian10_base_url }}/{{ pxeboot_debian10_version }}/{{ item['name'] }}"
- dest: "{{ pxeboot_web_root }}/debian10/{{ item['name'] }}"
- checksum: "{{ item['checksum'] }}"
- owner: "{{ pxeboot_username }}"
- group: "{{ pxeboot_groupname }}"
- mode: "0644"
- with_items: "{{ pxeboot_debian10_files }}"
-
-- name: Download debian10 nonfree files
- get_url:
- url: "{{ pxeboot_debian10_nonfree_url }}/{{ item['path'] }}/{{ item['name'] }}"
- dest: "{{ pxeboot_web_root }}/debian10/{{ item['name'] }}"
- checksum: "{{ item['checksum'] }}"
- owner: "{{ pxeboot_username }}"
- group: "{{ pxeboot_groupname }}"
- mode: "0644"
- with_items: "{{ pxeboot_debian10_nonfree_files }}"
-
-# FIXME: No preseed yet
-# - name: Create preseed files
-# template:
-# src: "debian10_preseed.cfg.j2"
-# dest: "{{ pxeboot_web_root }}/debian10/{{ item['serial'] }}_preseed.cfg"
-# owner: "{{ pxeboot_username }}"
-# group: "{{ pxeboot_groupname }}"
-# mode: "0644"
-# with_items: "{{ pxeboot_hosts }}"
diff --git a/templates/boot.ipxe.j2 b/templates/boot.ipxe.j2
index a59bbe8..2b086fa 100644
--- a/templates/boot.ipxe.j2
+++ b/templates/boot.ipxe.j2
@@ -25,7 +25,6 @@
item --key f deb10f Debian 10 Installer (nonfree firmware)
{% endif %}
{% if "debian11" in pxeboot_boot_images %}
-item --key g deb11 Debian 11 Installer
item --key h deb11f Debian 11 Installer (nonfree firmware)
item --key h deb11afs Debian 11 Installer (nonfree firmware, auto, serial)
item --key h deb11afm Debian 11 Installer (nonfree firmware, auto, MAC)
@@ -34,7 +33,6 @@
item --key u ub1804 Ubuntu 18.04 Installer
item --key a ub1804as Ubuntu 18.04 Installer (fully automatic, serial)
item --key m ub1804am Ubuntu 18.04 Installer (fully automatic, MAC)
-item --key t ub1804adt Ubuntu 18.04 Installer (fully automatic, debug, text)
{% endif %}
{% if "ubuntu2004" in pxeboot_boot_images %}
item --key v ub2004 Ubuntu 20.04 Installer
@@ -95,46 +93,22 @@
{% endif %}
# installers
-{% if "debian10" in pxeboot_boot_images %}
-
-# Debian 10
-:deb10
-echo Booting Debian 10 Installer
-kernel ${http_server_url}/debian10/linux initrd=initrd.gz
-initrd ${http_server_url}/debian10/initrd.gz initrd.gz
-boot || goto failed
-
-# Debian 10 with nonfree firmware
-:deb10f
-echo Booting Debian 10 Installer with nonfree firmware
-kernel ${http_server_url}/debian10/linux initrd=initrd.gz initrd=firmware.cpio.gz
-initrd ${http_server_url}/debian10/initrd.gz initrd.gz
-initrd ${http_server_url}/debian10/firmware.cpio.gz firmware.cpio.gz
-boot || goto failed
-{% endif %}
{% if "debian11" in pxeboot_boot_images %}
-# Debian 11
-:deb11
-echo Booting Debian 11 Installer
-kernel ${http_server_url}/debian11/linux initrd=initrd.gz
-initrd ${http_server_url}/debian11/initrd.gz
-boot || goto failed
-
# Debian 11 with nonfree firmware
:deb11f
echo Booting Debian 11 Installer with nonfree firmware
kernel ${http_server_url}/debian11/linux initrd=initrd.gz initrd=firmware.cpio.gz
-initrd ${http_server_url}/debian11/initrd.gz initrd.gz
-initrd ${http_server_url}/debian11/firmware.cpio.gz firmware.cpio.gz
+initrd ${http_server_url}/debian11/initrd.gz
+initrd ${http_server_url}/debian11/firmware.cpio.gz
boot || goto failed
# Debian 11 with nonfree firmware, auto, serial
:deb11afs
echo Booting Debian 11 Installer with nonfree firmware, auto, serial
kernel ${http_server_url}/debian11/linux initrd=initrd.gz initrd=firmware.cpio.gz initrd=preseed.cfg
-initrd ${http_server_url}/debian11/initrd.gz initrd.gz
-initrd ${http_server_url}/debian11/firmware.cpio.gz firmware.cpio.gz
+initrd ${http_server_url}/debian11/initrd.gz
+initrd ${http_server_url}/debian11/firmware.cpio.gz
initrd ${http_server_url}/debian11/${serial}_preseed.cfg preseed.cfg
boot || goto failed
@@ -142,8 +116,8 @@
:deb11afm
echo Booting Debian 11 Installer with nonfree firmware, auto, MAC
kernel ${http_server_url}/debian11/linux initrd=initrd.gz initrd=firmware.cpio.gz initrd=preseed.cfg
-initrd ${http_server_url}/debian11/initrd.gz initrd.gz
-initrd ${http_server_url}/debian11/firmware.cpio.gz firmware.cpio.gz
+initrd ${http_server_url}/debian11/initrd.gz
+initrd ${http_server_url}/debian11/firmware.cpio.gz
initrd ${http_server_url}/debian11/${net0/mac}_preseed.cfg preseed.cfg
boot || goto failed
{% endif %}
@@ -161,7 +135,7 @@
:ub1804as
echo Booting Ubuntu 18.04 Installer (autoinstall, serial)
kernel ${http_server_url}/ubuntu1804/linux initrd=initrd.gz initrd=preseed.cfg
-initrd ${http_server_url}/ubuntu1804/initrd.gz initrd.gz
+initrd ${http_server_url}/ubuntu1804/initrd.gz
initrd ${http_server_url}/ubuntu1804/${serial}_preseed.cfg preseed.cfg
boot || goto failed
@@ -170,7 +144,7 @@
:ub1804am
echo Booting Ubuntu 18.04 Installer (autoinstall, MAC)
kernel ${http_server_url}/ubuntu1804/linux initrd=initrd.gz initrd=preseed.cfg
-initrd ${http_server_url}/ubuntu1804/initrd.gz initrd.gz
+initrd ${http_server_url}/ubuntu1804/initrd.gz
initrd ${http_server_url}/ubuntu1804/${net0/mac}_preseed.cfg preseed.cfg
boot || goto failed
{% if pxeboot_image_debug %}
@@ -179,18 +153,18 @@
:ub1804adt
echo Booting Ubuntu 18.04 Installer, text mode, debug
kernel ${http_server_url}/ubuntu1804/linux initrd=initrd.gz initrd=preseed.cfg DEBIAN_FRONTEND=text BOOT_DEBUG=2
-initrd ${http_server_url}/ubuntu1804/initrd.gz initrd.gz
+initrd ${http_server_url}/ubuntu1804/initrd.gz
initrd ${http_server_url}/ubuntu1804/${serial}_preseed.cfg preseed.cfg
boot || goto failed
{% endif %}
{% endif %}
{% if "ubuntu2004" in pxeboot_boot_images %}
-# Ubuntu 18.04
+# Ubuntu 20.04
:ub2004
echo Booting Ubuntu 20.04 Installer
kernel ${http_server_url}/ubuntu2004/linux initrd=initrd.gz
-initrd ${http_server_url}/ubuntu2004/initrd.gz initrd.gz
+initrd ${http_server_url}/ubuntu2004/initrd.gz
boot || goto failed
{% endif %}
{% if "openbsd70" in pxeboot_boot_images %}