Skip to content

Commit 537c22c

Browse files
authored
Merge pull request #514 from stackhpc/upstream/2024.1-2026-01-26
Synchronise 2024.1 with upstream
2 parents 669ee28 + a497c42 commit 537c22c

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

docker/ironic/ironic-pxe/Dockerfile.j2

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1414
'grub2-efi-aa64-modules',
1515
'ipxe-bootimgs',
1616
'shim-*64',
17+
'syslinux-tftpboot',
1718
'tftp-server',
1819
] %}
1920

20-
{% if base_arch in ['x86_64'] %}
21-
{% set ironic_pxe_packages = ironic_pxe_packages + [
22-
'syslinux-tftpboot'
23-
] %}
24-
{% endif %}
25-
2621
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
2722
{% elif base_package_type == 'deb' %}
2823
{% set ironic_pxe_packages = [
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Install syslinux-tftpboot in the ironic-pxe RPM image on all architectures
5+
so TFTP boot files (pxelinux.0, chain.c32, ldlinux.c32) are present on
6+
aarch64.

0 commit comments

Comments
 (0)