Skip filesystem shrinking without error if small

This commit is contained in:
Joel Busch 2022-02-28 23:57:26 +01:00
parent 43f1a885cd
commit 2d97ee2195
1 changed files with 25 additions and 25 deletions

View File

@ -332,10 +332,8 @@ fi
minsize=$(cut -d ':' -f 2 <<< "$minsize" | tr -d ' ') minsize=$(cut -d ':' -f 2 <<< "$minsize" | tr -d ' ')
logVariables $LINENO currentsize minsize logVariables $LINENO currentsize minsize
if [[ $currentsize -eq $minsize ]]; then if [[ $currentsize -eq $minsize ]]; then
error $LINENO "Image already shrunk to smallest size" info "Filesystem already shrunk to smallest size. Skipping filesystem shrinking."
exit 11 else
fi
#Add some free space to the end of the filesystem #Add some free space to the end of the filesystem
extra_space=$(($currentsize - $minsize)) extra_space=$(($currentsize - $minsize))
logVariables $LINENO extra_space logVariables $LINENO extra_space
@ -360,8 +358,10 @@ if (( $rc )); then
exit 12 exit 12
fi fi
sleep 1 sleep 1
fi
#Shrink partition #Shrink partition
info "Shrinking partition"
partnewsize=$(($minsize * $blocksize)) partnewsize=$(($minsize * $blocksize))
newpartend=$(($partstart + $partnewsize)) newpartend=$(($partstart + $partnewsize))
logVariables $LINENO partnewsize newpartend logVariables $LINENO partnewsize newpartend