diff options
| author | Zuul <zuul@review.opendev.org> | 2023-03-20 16:42:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-03-20 16:42:51 +0000 |
| commit | 429d8456fcdcd1011e7e82dc38e286396a4c155a (patch) | |
| tree | f6bf0251c974c2ebc040c4d17368a0fbfd3b53e1 | |
| parent | 3d008b7f5ec2a54d004e8e9370f303ef9dc7858b (diff) | |
| parent | 9da0d151898560cfe1336e1096c1dd871ef184b9 (diff) | |
| download | kolla-429d8456fcdcd1011e7e82dc38e286396a4c155a.tar.gz kolla-429d8456fcdcd1011e7e82dc38e286396a4c155a.zip | |
Merge "Remove ipxe code for Ubuntu Focal"
| -rw-r--r-- | docker/ironic/ironic-pxe/extend_start.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh index c0272c1c0..50aa543a7 100644 --- a/docker/ironic/ironic-pxe/extend_start.sh +++ b/docker/ironic/ironic-pxe/extend_start.sh @@ -43,14 +43,7 @@ function prepare_ipxe { # was ipxe.efi. Ensure that both exist, using symlinks where the files are # named differently to allow the original names to be used in ironic.conf. if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then - cp /usr/lib/ipxe/{undionly.kpxe,ipxe.efi} ${TFTPBOOT_PATH}/ - # NOTE(mgoddard): The 'else' can be removed when snponly.efi is - # available in Jammy 22.04. - if [[ -f /usr/lib/ipxe/snponly.efi ]]; then - cp /usr/lib/ipxe/snponly.efi ${TFTPBOOT_PATH}/snponly.efi - elif [[ ! -e ${TFTPBOOT_PATH}/snponly.efi ]]; then - ln -s ${TFTPBOOT_PATH}/ipxe.efi ${TFTPBOOT_PATH}/snponly.efi - fi + cp /usr/lib/ipxe/{undionly.kpxe,ipxe.efi,snponly.efi} ${TFTPBOOT_PATH}/ elif [[ "${KOLLA_BASE_DISTRO}" =~ centos|rocky ]]; then cp /usr/share/ipxe/{undionly.kpxe,ipxe*.efi} ${TFTPBOOT_PATH}/ if [[ ! -e ${TFTPBOOT_PATH}/ipxe.efi ]]; then |