From a83f30e03222df192170d6d9694bf16908d896b3 Mon Sep 17 00:00:00 2001 From: Bin Qian Date: Tue, 12 Oct 2021 14:43:53 -0400 Subject: [PATCH] Prepare upgrade to OSTree enabled distribution This change is to enable the upgrade to next release, which will support OSTree. In the next release, /www and /pxeboot will be moved to /var/www and /var/pxeboot respectively. During upgrade to next release, rpms from next release will need to be extracted into current release structure (/var and /pxeboot). TCs: Passed: upgrade to build with /www and /pxeboot moved under /var. Change-Id: Id0dec2dee89dcad04c24b12a7a6072d03078f65e Story: 2009101 Task: 43539 Signed-off-by: Bin Qian --- cgcs-patch/bin/upgrade-start-pkg-extract | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cgcs-patch/bin/upgrade-start-pkg-extract b/cgcs-patch/bin/upgrade-start-pkg-extract index add71afb..ee4ea88e 100644 --- a/cgcs-patch/bin/upgrade-start-pkg-extract +++ b/cgcs-patch/bin/upgrade-start-pkg-extract @@ -110,9 +110,9 @@ fi dnf clean expire-cache extract_pkg pxe-network-installer rsync -ac ${WORKDIR}/usr/ /usr/ && -rsync -ac ${WORKDIR}/pxeboot/rel-${TGT_RELEASE}/ /pxeboot/rel-${TGT_RELEASE}/ && -rsync -c ${WORKDIR}/pxeboot/pxelinux.cfg.files/*-${TGT_RELEASE} /pxeboot/pxelinux.cfg.files/ && -rsync -ac ${WORKDIR}/www/pages/feed/rel-${TGT_RELEASE}/ /www/pages/feed/rel-${TGT_RELEASE}/ +rsync -ac ${WORKDIR}/var/pxeboot/rel-${TGT_RELEASE}/ /pxeboot/rel-${TGT_RELEASE}/ && +rsync -c ${WORKDIR}/var/pxeboot/pxelinux.cfg.files/*-${TGT_RELEASE} /pxeboot/pxelinux.cfg.files/ && +rsync -ac ${WORKDIR}/var/www/pages/feed/rel-${TGT_RELEASE}/ /www/pages/feed/rel-${TGT_RELEASE}/ if [ $? -ne 0 ]; then logger -t $0 "rsync command failed, extracting pxe-network-installer" exit 1 @@ -126,7 +126,7 @@ if [ -z "${WORKDIR}" -o ! -d "${WORKDIR}" ]; then exit 1 fi extract_pkg platform-kickstarts -rsync -ac ${WORKDIR}/www/pages/feed/rel-${TGT_RELEASE}/ /www/pages/feed/rel-${TGT_RELEASE}/ +rsync -ac ${WORKDIR}/var/www/pages/feed/rel-${TGT_RELEASE}/ /www/pages/feed/rel-${TGT_RELEASE}/ if [ $? -ne 0 ]; then logger -t $0 "rsync command failed, extracting platform-kickstarts" exit 1