From 63912dc0b0ace9c85d973e4e56903d4ebb457d07 Mon Sep 17 00:00:00 2001 From: "Junfeng (Shawn) Li" Date: Tue, 29 Nov 2022 09:13:04 -0500 Subject: [PATCH] Update pxe boot directory in kickstart for 21.12 Details: This change is to allow the kickstart looking for the right pxe boot directory in 21.12 for 22.12 upgrade Test Plan: PASS: 22.12 Debian is installed on both controllers Task: 46968 Story: 2009303 Signed-off-by: Junfeng (Shawn) Li Change-Id: I3401a25d41dd3af2c63fdb90c83316a35a9733d0 --- kickstart/files/kickstart.cfg | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg index 264b1fe1..838e12a9 100644 --- a/kickstart/files/kickstart.cfg +++ b/kickstart/files/kickstart.cfg @@ -2720,11 +2720,16 @@ if [ "$(curl -sf http://pxecontroller:6385/v1/upgrade/${hostname}/upgrade_in_pro ${IMAGE_ROOTFS}/usr/bin/rpm2cpio ${INSTALL_RPM} | cpio -idm \ || 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}/ \ || 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" - 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" rm -rf ${TMP_RPM}