starlingx/metal
Code Issues Proposed changes

Merge "Update pxe boot directory in kickstart for 21.12"

Browse Source
This commit is contained in:
Zuul 2023-01-25 19:44:32 +00:00 committed by Gerrit Code Review
commit acbd301a1c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kickstart/files/kickstart.cfg
View File

@ -2781,11 +2781,16 @@ if [ "$(curl -sf http://pxecontroller:6385/v1/upgrade/${hostname}/upgrade_in_pro
${IMAGE_ROOTFS}/usr/bin/rpm2cpio ${INSTALL_RPM} | cpio -idm \ ${IMAGE_ROOTFS}/usr/bin/rpm2cpio ${INSTALL_RPM} | cpio -idm \
|| report_failure_with_msg "Failed to extract pxe-network-installer" || report_failure_with_msg "Failed to extract pxe-network-installer"
PXEBOOT_DIR="/var/pxeboot/"
if [[ "${OTHER_REL_VERSION}" == "21.12" ]]; then
PXEBOOT_DIR="/pxeboot/"
fi
cp -r ${TMP_RPM}/usr ${IMAGE_ROOTFS}/ \ cp -r ${TMP_RPM}/usr ${IMAGE_ROOTFS}/ \
|| report_failure_with_msg "Failed to copy pxe-network-installer /usr" || report_failure_with_msg "Failed to copy pxe-network-installer /usr"
cp -r ${TMP_RPM}/var/pxeboot/$OTHER_REL_DIR ${IMAGE_ROOTFS}/var/pxeboot/ \ cp -r ${TMP_RPM}${PXEBOOT_DIR}$OTHER_REL_DIR ${IMAGE_ROOTFS}/var/pxeboot/ \
|| report_failure_with_msg "Failed to copy pxe-network-installer /var/pxeboot/$OTHER_REL_DIR" || report_failure_with_msg "Failed to copy pxe-network-installer /var/pxeboot/$OTHER_REL_DIR"
cp ${TMP_RPM}/var/pxeboot/pxelinux.cfg.files/*-${OTHER_REL_VERSION} ${IMAGE_ROOTFS}/var/pxeboot/pxelinux.cfg.files/ \ cp ${TMP_RPM}${PXEBOOT_DIR}pxelinux.cfg.files/*-${OTHER_REL_VERSION} ${IMAGE_ROOTFS}/var/pxeboot/pxelinux.cfg.files/ \
|| report_failure_with_msg "Failed to copy pxe-network-installer pxelinux.cfg files" || report_failure_with_msg "Failed to copy pxe-network-installer pxelinux.cfg files"
rm -rf ${TMP_RPM} rm -rf ${TMP_RPM}