Skip to content

Commit a2ec463

Browse files
authored
Merge pull request #512 from stackhpc/upstream/2025.1-2026-01-23
Synchronise 2025.1 with upstream
2 parents 5e52f9e + be538a9 commit a2ec463

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
@@ -17,15 +17,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1717
'ipxe-bootimgs-aarch64',
1818
'mtools',
1919
'shim-*64',
20+
'syslinux-tftpboot',
2021
'tftp-server',
2122
] %}
2223

23-
{% if base_arch in ['x86_64'] %}
24-
{% set ironic_pxe_packages = ironic_pxe_packages + [
25-
'syslinux-tftpboot'
26-
] %}
27-
{% endif %}
28-
2924
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
3025
{% elif base_package_type == 'deb' %}
3126
{% 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)