From e7c035db21de394e0b7b0a71f268a3c5052b5cc5 Mon Sep 17 00:00:00 2001
From: Bin Qian <bin.qian@windriver.com>
Date: Mon, 16 Aug 2021 16:26:12 -0400
Subject: [PATCH] relocate /www to /var/www

Relocate writable /www to /var/www

Story: 2009101
Task: 43539
Depends-on: https://review.opendev.org/c/starlingx/metal/+/810023
Change-Id: Icf3cabdb879e9a26e279427460e13b2911a092bc
Signed-off-by: Bin Qian <bin.qian@windriver.com>
---
 cgcs-patch/bin/sw-patch-controller-init.sh          | 2 +-
 cgcs-patch/bin/sw-patch.completion                  | 4 ++--
 cgcs-patch/bin/upgrade-start-pkg-extract            | 8 ++++----
 cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cgcs-patch/bin/sw-patch-controller-init.sh b/cgcs-patch/bin/sw-patch-controller-init.sh
index 144683a0..c9190c9c 100644
--- a/cgcs-patch/bin/sw-patch-controller-init.sh
+++ b/cgcs-patch/bin/sw-patch-controller-init.sh
@@ -23,7 +23,7 @@
 NAME=$(basename $0)
 
 REPO_ID=updates
-REPO_ROOT=/www/pages/${REPO_ID}
+REPO_ROOT=/var/www/pages/${REPO_ID}
 REPO_DIR=${REPO_ROOT}/rel-${SW_VERSION}
 GROUPS_FILE=$REPO_DIR/comps.xml
 PATCHING_DIR=/opt/patching
diff --git a/cgcs-patch/bin/sw-patch.completion b/cgcs-patch/bin/sw-patch.completion
index c4b1ec33..4bca798d 100644
--- a/cgcs-patch/bin/sw-patch.completion
+++ b/cgcs-patch/bin/sw-patch.completion
@@ -88,7 +88,7 @@ function _swpatch()
             query)
                 if [ "${prev}" = "--release" ]; then
                     # If --release has been specified, provide installed releases for completion
-                    local releases=$(/bin/ls -d /www/pages/feed/rel-* 2>/dev/null | sed 's#/www/pages/feed/rel-##')
+                    local releases=$(/bin/ls -d /var/www/pages/feed/rel-* 2>/dev/null | sed 's#/var/www/pages/feed/rel-##')
                     COMPREPLY=( $(compgen -W "${releases}" -- ${cur}) )
                 else
                     # --release is only completion option for query
@@ -110,7 +110,7 @@ function _swpatch()
             commit)
                 if [ "${prev}" = "--release" ]; then
                     # If --release has been specified, provide installed releases for completion
-                    local releases=$(/bin/ls -d /www/pages/feed/rel-* 2>/dev/null | sed 's#/www/pages/feed/rel-##')
+                    local releases=$(/bin/ls -d /var/www/pages/feed/rel-* 2>/dev/null | sed 's#/var/www/pages/feed/rel-##')
                     COMPREPLY=( $(compgen -W "${releases}" -- ${cur}) )
                 else
                     # Query the list of known patches
diff --git a/cgcs-patch/bin/upgrade-start-pkg-extract b/cgcs-patch/bin/upgrade-start-pkg-extract
index ee4ea88e..1ab56559 100644
--- a/cgcs-patch/bin/upgrade-start-pkg-extract
+++ b/cgcs-patch/bin/upgrade-start-pkg-extract
@@ -52,8 +52,8 @@ if [ "${TGT_RELEASE}" = "${SW_VERSION}" ]; then
     exit 1
 fi
 
-declare TGT_BASE_REPO=/www/pages/feed/rel-${TGT_RELEASE}
-declare TGT_PATCHES_REPO=/www/pages/updates/rel-${TGT_RELEASE}
+declare TGT_BASE_REPO=/var/www/pages/feed/rel-${TGT_RELEASE}
+declare TGT_PATCHES_REPO=/var/www/pages/updates/rel-${TGT_RELEASE}
 
 if [ ! -d ${TGT_BASE_REPO} ]; then
     logger -t $0 "Target release ${TGT_RELEASE} is not installed"
@@ -112,7 +112,7 @@ extract_pkg pxe-network-installer
 rsync -ac ${WORKDIR}/usr/ /usr/ &&
 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}/
+rsync -ac ${WORKDIR}/var/www/pages/feed/rel-${TGT_RELEASE}/ /var/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}/var/www/pages/feed/rel-${TGT_RELEASE}/ /www/pages/feed/rel-${TGT_RELEASE}/
+rsync -ac ${WORKDIR}/var/www/pages/feed/rel-${TGT_RELEASE}/ /var/www/pages/feed/rel-${TGT_RELEASE}/
 if [ $? -ne 0 ]; then
     logger -t $0 "rsync command failed, extracting platform-kickstarts"
     exit 1
diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
index 38ddd1b0..add102e8 100644
--- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
@@ -44,7 +44,7 @@ applied_dir = "%s/metadata/applied" % patch_dir
 committed_dir = "%s/metadata/committed" % patch_dir
 semantics_dir = "%s/semantics" % patch_dir
 
-repo_root_dir = "/www/pages/updates"
+repo_root_dir = "/var/www/pages/updates"
 repo_dir = {SW_VERSION: "%s/rel-%s" % (repo_root_dir, SW_VERSION)}
 
 root_package_dir = "%s/packages" % patch_dir
@@ -308,7 +308,7 @@ class BasePackageData(object):
 
     def loaddirs(self):
         # Load up available package info
-        base_dir = "/www/pages/feed"
+        base_dir = "/var/www/pages/feed"
         if not os.path.exists(base_dir):
             # Return, since this could be running off-box
             return