From e37f69765ee4b9e85552cee44065d2f35e4003ab Mon Sep 17 00:00:00 2001
From: Heitor Matsui <heitorvieira.matsui@windriver.com>
Date: Tue, 21 Nov 2023 12:19:04 -0300
Subject: [PATCH] Copy GA metadata file to USM location

This commits switches the GA metadata file copy from
/opt/patching/metadata to /opt/software/metadata.

Test Plan
PASS: build iso, install and verify that "software list"
      lists the GA release

Story: 2010676
Task: 49112

Change-Id: I75b8cd6ae41a9cf9b5af0225ebcaaf0d9e0ddb4e
Signed-off-by: Heitor Matsui <heitorvieira.matsui@windriver.com>
---
 kickstart/files/kickstart.cfg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index 19b8f524..299e086f 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -3003,18 +3003,18 @@ fi
 # Verify Patched iso
 if [ -d "/instboot/patches" ]; then
     ilog "Prepatched iso"
-    ilog "Creating patching metadata directories"
-    mkdir -p ${IMAGE_ROOTFS}/var/rootdirs/opt/patching/metadata/{committed,available,applied}
-    cp -a /instboot/patches/* ${IMAGE_ROOTFS}/var/rootdirs/opt/patching/metadata/committed/
+    ilog "Creating USM metadata directories"
+    mkdir -p ${IMAGE_ROOTFS}/var/rootdirs/opt/software/metadata/{committed,available,applied}
+    cp -a /instboot/patches/* ${IMAGE_ROOTFS}/var/rootdirs/opt/software/metadata/committed/
 else
     # Prepatch iso pxeboot
     patches_url="${insturl/ostree_repo/patches}"
     wget ${NOVERIFYSSL_WGET_OPT} -q --spider ${patches_url}/
     if [ $? -eq 0 ]; then
         ilog "Prepatched iso from pxeboot"
-        ilog "Creating patching metadata directories"
-        mkdir -p ${IMAGE_ROOTFS}/var/rootdirs/opt/patching/metadata/{committed,available,applied}
-        cd ${IMAGE_ROOTFS}/var/rootdirs/opt/patching/metadata/committed
+        ilog "Creating USM metadata directories"
+        mkdir -p ${IMAGE_ROOTFS}/var/rootdirs/opt/software/metadata/{committed,available,applied}
+        cd ${IMAGE_ROOTFS}/var/rootdirs/opt/software/metadata/committed
         wget ${NOVERIFYSSL_WGET_OPT} --recursive --no-parent --no-host-directories --no-clobber \
             --accept='*.xml' -o /${LAT_DIR}/wget_prepatch_metadata.log -nd ${patches_url}/
         ilog "Metadata files copied"