diff options
| author | Zuul <zuul@review.opendev.org> | 2026-07-31 16:25:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-07-31 16:25:24 +0000 |
| commit | 8e912a9db7f013a1abfc1e70a829e435d50622db (patch) | |
| tree | dea063592e33fdbda54232d4633e15c3b7c3cca2 /kolla/docker | |
| parent | 495b6b8fe437a06f32575b7308192ffc4f76f7b9 (diff) | |
| parent | 2da1223d8301da05f9b070ca656d62c1bde93c66 (diff) | |
| download | kolla-8e912a9db7f013a1abfc1e70a829e435d50622db.tar.gz kolla-8e912a9db7f013a1abfc1e70a829e435d50622db.zip | |
Merge "ironic-pxe: don't fail if symlinks already exist"
Diffstat (limited to 'kolla/docker')
| -rw-r--r-- | kolla/docker/ironic/ironic-pxe/extend_start.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kolla/docker/ironic/ironic-pxe/extend_start.sh b/kolla/docker/ironic/ironic-pxe/extend_start.sh index 06a8312b4..8e4d63307 100644 --- a/kolla/docker/ironic/ironic-pxe/extend_start.sh +++ b/kolla/docker/ironic/ironic-pxe/extend_start.sh @@ -46,15 +46,13 @@ function prepare_ipxe { # NOTE(m-anson): ipxe-arm64.efi is not symlinked from /boot to # /usr/lib/ipxe by the Ubuntu ipxe package, so fix that here. if [[ -e /boot/ipxe-arm64.efi ]]; then - ln -s /boot/ipxe-arm64.efi /usr/lib/ipxe/ + ln -sf /boot/ipxe-arm64.efi /usr/lib/ipxe/ 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-snponly-x86_64.efi} ${TFTPBOOT_PATH}/ cp /usr/share/ipxe/arm64-efi/snponly.efi ${TFTPBOOT_PATH}/ipxe-snponly-aarch64.efi - if [[ ! -e ${TFTPBOOT_PATH}/snponly.efi ]]; then - ln -s ${TFTPBOOT_PATH}/ipxe-snponly-${KOLLA_BASE_ARCH}.efi ${TFTPBOOT_PATH}/snponly.efi - fi + ln -sf ${TFTPBOOT_PATH}/ipxe-snponly-${KOLLA_BASE_ARCH}.efi ${TFTPBOOT_PATH}/snponly.efi fi } |