starlingx/utilities
Code Issues Proposed changes

relocate /www to /var/www

Browse Source 
Relocate writable /www to /var/www

Story: 2009101
Task: 43535
Depends-on: https://review.opendev.org/c/starlingx/metal/+/810023
Change-Id: Iecb3e679d73350072a6d9e0219e001c1d8c53c09
Signed-off-by: Bin Qian <bin.qian@windriver.com>
This commit is contained in:
Bin Qian 2021-08-16 16:27:22 -04:00
parent 284044eb2b
commit e0b9fbadcb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/collector/scripts/collect_patching.sh
View File

@ -37,8 +37,8 @@ if [ "$nodetype" = "controller" ] ; then
delimiter ${LOGFILE} "find /opt/patching"
find /opt/patching 2>>${COLLECT_ERROR_LOG} >> ${LOGFILE}
delimiter ${LOGFILE} "find /www/pages/updates"
find /www/pages/updates 2>>${COLLECT_ERROR_LOG} >> ${LOGFILE}
delimiter ${LOGFILE} "find /var/www/pages/updates"
find /var/www/pages/updates 2>>${COLLECT_ERROR_LOG} >> ${LOGFILE}
fi

4
utilities/platform-util/scripts/gen-bootloader-iso.sh
View File

@ -376,7 +376,7 @@ function handle_delete {
}
function get_patches_from_host {
local host_patch_repo=/www/pages/updates/rel-${ISO_VERSION}
local host_patch_repo=/var/www/pages/updates/rel-${ISO_VERSION}
if [ ! -d ${host_patch_repo} ]; then
log_error "Patch repo not found: ${host_patch_repo}"
@ -512,7 +512,7 @@ function extract_shared_files {
if [ ${PATCHES_FROM_HOST} = "yes" ]; then
extract_pkg_to_workdir 'pxe-network-installer'
local patched_squashfs_img_file=${WORKDIR}/www/pages/feed/rel-${ISO_VERSION}/LiveOS/squashfs.img
local patched_squashfs_img_file=${WORKDIR}/var/www/pages/feed/rel-${ISO_VERSION}/LiveOS/squashfs.img
if [ -f ${patched_squashfs_img_file} ]; then
# Use the patched squashfs.img
squashfs_img_file=${patched_squashfs_img_file}