starlingx/update
Code Issues Proposed changes

Merge "Fix missing file in software deploy delete command"

Browse Source
This commit is contained in:
Zuul
2024-11-08 20:33:13 +00:00
committed by Gerrit Code Review
parent a9cfc57043 44554aef3a
commit d0f63ebf05
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
software/scripts/deploy-cleanup
View File

@@ -55,9 +55,14 @@ stop_database() {
unmount_filesystems() { unmount_filesystems() {
local rootdir=$1 local rootdir=$1
local rc=0 local rc=0
local filepath="${rootdir}/usr/sbin/software-deploy/chroot_mounts.sh"
if [ ! -f $filepath ]; then
filepath=/var/www/pages/feed/rel-${to_ver}/upgrades/software-deploy/chroot_mounts.sh
fi
info "Attempting to unmount filesystems under ${rootdir}..." info "Attempting to unmount filesystems under ${rootdir}..."
sudo ${rootdir}/usr/sbin/software-deploy/chroot_mounts.sh ${rootdir} -u sudo $filepath ${rootdir} -u
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
rc=1 rc=1
error "Error unmounting filesystems." error "Error unmounting filesystems."
@@ -71,9 +76,14 @@ remove_temp_directories() {
local repo=$1 local repo=$1
local rootdir=$2 local rootdir=$2
local rc=0 local rc=0
local filepath="${rootdir}/usr/sbin/software-deploy/chroot_mounts.sh"
if [ ! -f $filepath ]; then
filepath=/var/www/pages/feed/rel-${to_ver}/upgrades/software-deploy/chroot_mounts.sh
fi
info "Attempting to remove temporary deployment directories [${repo}, ${rootdir}]..." info "Attempting to remove temporary deployment directories [${repo}, ${rootdir}]..."
sudo ${rootdir}/usr/sbin/software-deploy/chroot_mounts.sh ${rootdir} -c sudo $filepath ${rootdir} -c
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
rc=1 rc=1
error "Some mount points are still mounted, cannot proceed with the cleanup." error "Some mount points are still mounted, cannot proceed with the cleanup."