diff options
| author | Owen Jones <owen@stackhpc.com> | 2026-07-10 14:53:24 +0100 |
|---|---|---|
| committer | Owen Jones <owen@stackhpc.com> | 2026-07-20 16:24:55 +0100 |
| commit | 2da1223d8301da05f9b070ca656d62c1bde93c66 (patch) | |
| tree | 73ba2ff2e0ba9e18c4a5156618858679e8f1e6ee /kolla/docker | |
| parent | a18c9dd7662d5cdaf7b0986d7e1a32b04360cd7b (diff) | |
| download | kolla-2da1223d8301da05f9b070ca656d62c1bde93c66.tar.gz kolla-2da1223d8301da05f9b070ca656d62c1bde93c66.zip | |
ironic-pxe: don't fail if symlinks already exist
`ironic-pxe` start-up fails if symlinks to efi files have previously
been created. Removing test for existence and adding `-f` flag to
symlink creation ensures they always exist without failing on start.
Closes-Bug: #2160317
Change-Id: Ib736e5beb201409c8987fbc62225c75f89cbfe62
Signed-off-by: Owen Jones <owen@stackhpc.com>
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 } |