diff options
| author | Pierre Riteau <pierre@stackhpc.com> | 2023-02-15 09:08:59 +0100 |
|---|---|---|
| committer | Pierre Riteau <pierre@stackhpc.com> | 2023-02-15 14:00:30 +0000 |
| commit | 9da0d151898560cfe1336e1096c1dd871ef184b9 (patch) | |
| tree | 04dccc1bee45cbdcc3686451814a0958aa086dae | |
| parent | ca0238598a37c4a174c7b8d55b64c15bb34ef58a (diff) | |
| download | kolla-9da0d151898560cfe1336e1096c1dd871ef184b9.tar.gz kolla-9da0d151898560cfe1336e1096c1dd871ef184b9.zip | |
Remove ipxe code for Ubuntu Focal
The ipxe package in Ubuntu Jammy includes snponly.efi [1]. Remove code
to handle Focal in which snponly.efi is absent from the ipxe package.
[1] https://packages.ubuntu.com/jammy/all/ipxe/filelist
Change-Id: I5f494de36e6400b5486c1fb786b73c9e1512a046
| -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 |