Loading src/disk.sh +121 −88 Original line number Diff line number Diff line Loading @@ -76,41 +76,103 @@ getSize() { esac } resizeDisk() { createDisk() { local DISK_FILE=$1 local CUR_SIZE=$2 local DATA_SIZE=$3 local DISK_SPACE=$4 local DISK_DESC=$5 local DISK_FMT=$6 local SPACE SPACE_GB local DISK_SPACE=$2 local DISK_DESC=$3 local DISK_FMT=$4 local DIR SPACE DATA_SIZE local GB=$(( (CUR_SIZE + 1073741823)/1073741824 )) info "Resizing $DISK_DESC from ${GB}G to $DISK_SPACE .." local FAIL="Could not resize $DISK_FMT file of $DISK_DESC ($DISK_FILE) from ${GB}G to $DISK_SPACE .." if [[ "$ALLOCATE" != [Nn]* ]]; then local REQ=$((DATA_SIZE-CUR_SIZE)) (( REQ < 1 )) && error "Shrinking disks is not supported!" && exit 71 # Check free diskspace DIR=$(dirname "$DISK_FILE") SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1) local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE") if (( DATA_SIZE > SPACE )); then error "Not enough free space to create a $DISK_DESC of $DISK_SPACE in $DIR, it has only $SPACE_GB GB available..." error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 76 fi fi local FAIL="Could not create a $DISK_SPACE $DISK_FMT file for $DISK_DESC ($DISK_FILE)" case "${DISK_FMT,,}" in raw) if [[ "$ALLOCATE" == [Nn]* ]]; then # Resize file by changing its length # Create an empty file if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then error "$FAIL" && exit 75 rm -f "$DISK_FILE" error "$FAIL" && exit 77 fi else # Create an empty file if ! fallocate -l "$DISK_SPACE" "$DISK_FILE"; then if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then rm -f "$DISK_FILE" error "$FAIL" && exit 77 fi fi fi ;; qcow2) local DISK_OPTS="$DISK_ALLOC" [ -n "$DISK_FLAGS" ] && DISK_OPTS="$DISK_OPTS,$DISK_FLAGS" if ! qemu-img create -f "$DISK_FMT" -o "$DISK_OPTS" -- "$DISK_FILE" "$DISK_SPACE" ; then rm -f "$DISK_FILE" error "$FAIL" && exit 70 fi ;; esac return 0 } resizeDisk() { local DISK_FILE=$1 local DISK_SPACE=$2 local DISK_DESC=$3 local DISK_FMT=$4 local CUR_SIZE DATA_SIZE DIR SPACE CUR_SIZE=$(getSize "$DISK_FILE") DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE") local REQ=$((DATA_SIZE-CUR_SIZE)) (( REQ < 1 )) && error "Shrinking disks is not supported yet, please increase ${DISK_DESC^^}_SIZE." && exit 71 if [[ "$ALLOCATE" != [Nn]* ]]; then # Check free diskspace DIR=$(dirname "$DISK_FILE") SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1) SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) if (( REQ > SPACE )); then error "Not enough free space to resize $DISK_DESC to $DISK_SPACE in $DIR, it has only $SPACE_GB GB available.." error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting DISK_FMT to \"qcow2\"." && exit 74 error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 74 fi fi local GB=$(( (CUR_SIZE + 1073741823)/1073741824 )) info "Resizing $DISK_DESC from ${GB}G to $DISK_SPACE..." local FAIL="Could not resize $DISK_FMT file of $DISK_DESC ($DISK_FILE) from ${GB}G to $DISK_SPACE .." case "${DISK_FMT,,}" in raw) if [[ "$ALLOCATE" == [Nn]* ]]; then # Resize file by changing its length if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then error "$FAIL" && exit 75 fi else # Resize file by allocating more space if ! fallocate -l "$DISK_SPACE" "$DISK_FILE"; then Loading @@ -127,6 +189,8 @@ resizeDisk() { fi ;; esac return 0 } convertDisk() { Loading @@ -134,8 +198,31 @@ convertDisk() { local SOURCE_FMT=$2 local DST_FILE=$3 local DST_FMT=$4 local DISK_BASE=$5 local DISK_DESC=$6 local CONV_FLAGS="-p" local DISK_OPTS="$DISK_ALLOC" local TMP_FILE="$DISK_BASE.tmp" local DIR CUR_SIZE SPACE [ -f "$DST_FILE" ] && error "Conversion failed, destination file $DST_FILE already exists?" && exit 79 [ ! -f "$SOURCE_FILE" ] && error "Conversion failed, source file $SOURCE_FILE does not exists?" && exit 79 if [[ "$ALLOCATE" != [Nn]* ]]; then # Check free diskspace DIR=$(dirname "$TMP_FILE") CUR_SIZE=$(getSize "$SOURCE_FILE") SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1) local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) if (( CUR_SIZE > SPACE )); then error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $SPACE_GB GB available..." error "Please free up some disk space or disable preallocation by setting ALLOCATE=N." && exit 76 fi fi info "Converting $DISK_DESC to $DST_FMT, please wait until completed..." case "$DST_FMT" in qcow2) Loading @@ -146,58 +233,20 @@ convertDisk() { ;; esac # shellcheck disable=SC2086 qemu-img convert -f "$SOURCE_FMT" $CONV_FLAGS -o "$DISK_OPTS" -O "$DST_FMT" -- "$SOURCE_FILE" "$DST_FILE" } createDisk() { local DISK_FILE=$1 local DISK_SPACE=$2 local DISK_DESC=$3 local DISK_FMT=$4 local SPACE SPACE_GB local FAIL="Could not create a $DISK_SPACE $DISK_FMT file for $DISK_DESC ($DISK_FILE)" case "${DISK_FMT,,}" in raw) if [[ "$ALLOCATE" == [Nn]* ]]; then rm -f "$TMP_FILE" # Create an empty file if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then rm -f "$DISK_FILE" error "$FAIL" && exit 77 # shellcheck disable=SC2086 if ! qemu-img convert -f "$SOURCE_FMT" $CONV_FLAGS -o "$DISK_OPTS" -O "$DST_FMT" -- "$SOURCE_FILE" "$TMP_FILE"; then rm -f "$TMP_FILE" error "Failed to convert $DISK_DESC to $DST_FMT format in $DIR, is there enough space available?" && exit 79 fi else rm -f "$SOURCE_FILE" mv "$TMP_FILE" "$DST_FILE" # Check free diskspace SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1) SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) info "Conversion of $DISK_DESC to $DST_FMT completed succesfully!" if (( DATA_SIZE > SPACE )); then error "Not enough free space to create a $DISK_DESC of $DISK_SPACE in $DIR, it has only $SPACE_GB GB available.." error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting DISK_FMT to \"qcow2\"." && exit 76 fi # Create an empty file if ! fallocate -l "$DISK_SPACE" "$DISK_FILE"; then if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then rm -f "$DISK_FILE" error "$FAIL" && exit 77 fi fi fi ;; qcow2) local DISK_OPTS="$DISK_ALLOC" [ -n "$DISK_FLAGS" ] && DISK_OPTS="$DISK_OPTS,$DISK_FLAGS" if ! qemu-img create -f "$DISK_FMT" -o "$DISK_OPTS" -- "$DISK_FILE" "$DISK_SPACE" ; then rm -f "$DISK_FILE" error "$FAIL" && exit 70 fi ;; esac return 0 } addDisk () { Loading @@ -210,7 +259,7 @@ addDisk () { local DISK_ADDRESS=$7 local DISK_FMT=$8 local DISK_FILE="$DISK_BASE.$DISK_EXT" local FS DIR CUR_SIZE DATA_SIZE local DIR FS DATA_SIZE PREV_FMT PREV_EXT CUR_SIZE DIR=$(dirname "$DISK_FILE") [ ! -d "$DIR" ] && return 0 Loading @@ -229,7 +278,6 @@ addDisk () { fi if ! [ -f "$DISK_FILE" ] ; then local PREV_EXT PREV_FMT if [[ "${DISK_FMT,,}" != "raw" ]]; then PREV_FMT="raw" Loading @@ -237,24 +285,9 @@ addDisk () { PREV_FMT="qcow2" fi PREV_EXT="$(fmt2ext "$PREV_FMT")" local PREV_FILE="$DISK_BASE.$PREV_EXT" if [ -f "$PREV_FILE" ] ; then info "Detected that ${DISK_DESC^^}_FMT changed from \"$PREV_FMT\" to \"$DISK_FMT\"." info "Starting conversion of $DISK_DESC to this new format, please wait until completed..." local TMP_FILE="$DISK_BASE.tmp" rm -f "$TMP_FILE" if ! convertDisk "$PREV_FILE" "$PREV_FMT" "$TMP_FILE" "$DISK_FMT" ; then rm -f "$TMP_FILE" error "Failed to convert $DISK_DESC to $DISK_FMT format." && exit 79 fi mv "$TMP_FILE" "$DISK_FILE" rm -f "$PREV_FILE" info "Conversion of $DISK_DESC completed succesfully!" if [ -f "$DISK_BASE.$PREV_EXT" ] ; then convertDisk "$DISK_BASE.$PREV_EXT" "$PREV_FMT" "$DISK_FILE" "$DISK_FMT" "$DISK_BASE" "$DISK_DESC" || exit $? fi fi Loading @@ -262,8 +295,8 @@ addDisk () { CUR_SIZE=$(getSize "$DISK_FILE") if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then resizeDisk "$DISK_FILE" "$CUR_SIZE" "$DATA_SIZE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" || exit $? if (( DATA_SIZE > CUR_SIZE )); then resizeDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" || exit $? fi else Loading Loading
src/disk.sh +121 −88 Original line number Diff line number Diff line Loading @@ -76,41 +76,103 @@ getSize() { esac } resizeDisk() { createDisk() { local DISK_FILE=$1 local CUR_SIZE=$2 local DATA_SIZE=$3 local DISK_SPACE=$4 local DISK_DESC=$5 local DISK_FMT=$6 local SPACE SPACE_GB local DISK_SPACE=$2 local DISK_DESC=$3 local DISK_FMT=$4 local DIR SPACE DATA_SIZE local GB=$(( (CUR_SIZE + 1073741823)/1073741824 )) info "Resizing $DISK_DESC from ${GB}G to $DISK_SPACE .." local FAIL="Could not resize $DISK_FMT file of $DISK_DESC ($DISK_FILE) from ${GB}G to $DISK_SPACE .." if [[ "$ALLOCATE" != [Nn]* ]]; then local REQ=$((DATA_SIZE-CUR_SIZE)) (( REQ < 1 )) && error "Shrinking disks is not supported!" && exit 71 # Check free diskspace DIR=$(dirname "$DISK_FILE") SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1) local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE") if (( DATA_SIZE > SPACE )); then error "Not enough free space to create a $DISK_DESC of $DISK_SPACE in $DIR, it has only $SPACE_GB GB available..." error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 76 fi fi local FAIL="Could not create a $DISK_SPACE $DISK_FMT file for $DISK_DESC ($DISK_FILE)" case "${DISK_FMT,,}" in raw) if [[ "$ALLOCATE" == [Nn]* ]]; then # Resize file by changing its length # Create an empty file if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then error "$FAIL" && exit 75 rm -f "$DISK_FILE" error "$FAIL" && exit 77 fi else # Create an empty file if ! fallocate -l "$DISK_SPACE" "$DISK_FILE"; then if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then rm -f "$DISK_FILE" error "$FAIL" && exit 77 fi fi fi ;; qcow2) local DISK_OPTS="$DISK_ALLOC" [ -n "$DISK_FLAGS" ] && DISK_OPTS="$DISK_OPTS,$DISK_FLAGS" if ! qemu-img create -f "$DISK_FMT" -o "$DISK_OPTS" -- "$DISK_FILE" "$DISK_SPACE" ; then rm -f "$DISK_FILE" error "$FAIL" && exit 70 fi ;; esac return 0 } resizeDisk() { local DISK_FILE=$1 local DISK_SPACE=$2 local DISK_DESC=$3 local DISK_FMT=$4 local CUR_SIZE DATA_SIZE DIR SPACE CUR_SIZE=$(getSize "$DISK_FILE") DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE") local REQ=$((DATA_SIZE-CUR_SIZE)) (( REQ < 1 )) && error "Shrinking disks is not supported yet, please increase ${DISK_DESC^^}_SIZE." && exit 71 if [[ "$ALLOCATE" != [Nn]* ]]; then # Check free diskspace DIR=$(dirname "$DISK_FILE") SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1) SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) if (( REQ > SPACE )); then error "Not enough free space to resize $DISK_DESC to $DISK_SPACE in $DIR, it has only $SPACE_GB GB available.." error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting DISK_FMT to \"qcow2\"." && exit 74 error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 74 fi fi local GB=$(( (CUR_SIZE + 1073741823)/1073741824 )) info "Resizing $DISK_DESC from ${GB}G to $DISK_SPACE..." local FAIL="Could not resize $DISK_FMT file of $DISK_DESC ($DISK_FILE) from ${GB}G to $DISK_SPACE .." case "${DISK_FMT,,}" in raw) if [[ "$ALLOCATE" == [Nn]* ]]; then # Resize file by changing its length if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then error "$FAIL" && exit 75 fi else # Resize file by allocating more space if ! fallocate -l "$DISK_SPACE" "$DISK_FILE"; then Loading @@ -127,6 +189,8 @@ resizeDisk() { fi ;; esac return 0 } convertDisk() { Loading @@ -134,8 +198,31 @@ convertDisk() { local SOURCE_FMT=$2 local DST_FILE=$3 local DST_FMT=$4 local DISK_BASE=$5 local DISK_DESC=$6 local CONV_FLAGS="-p" local DISK_OPTS="$DISK_ALLOC" local TMP_FILE="$DISK_BASE.tmp" local DIR CUR_SIZE SPACE [ -f "$DST_FILE" ] && error "Conversion failed, destination file $DST_FILE already exists?" && exit 79 [ ! -f "$SOURCE_FILE" ] && error "Conversion failed, source file $SOURCE_FILE does not exists?" && exit 79 if [[ "$ALLOCATE" != [Nn]* ]]; then # Check free diskspace DIR=$(dirname "$TMP_FILE") CUR_SIZE=$(getSize "$SOURCE_FILE") SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1) local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) if (( CUR_SIZE > SPACE )); then error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $SPACE_GB GB available..." error "Please free up some disk space or disable preallocation by setting ALLOCATE=N." && exit 76 fi fi info "Converting $DISK_DESC to $DST_FMT, please wait until completed..." case "$DST_FMT" in qcow2) Loading @@ -146,58 +233,20 @@ convertDisk() { ;; esac # shellcheck disable=SC2086 qemu-img convert -f "$SOURCE_FMT" $CONV_FLAGS -o "$DISK_OPTS" -O "$DST_FMT" -- "$SOURCE_FILE" "$DST_FILE" } createDisk() { local DISK_FILE=$1 local DISK_SPACE=$2 local DISK_DESC=$3 local DISK_FMT=$4 local SPACE SPACE_GB local FAIL="Could not create a $DISK_SPACE $DISK_FMT file for $DISK_DESC ($DISK_FILE)" case "${DISK_FMT,,}" in raw) if [[ "$ALLOCATE" == [Nn]* ]]; then rm -f "$TMP_FILE" # Create an empty file if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then rm -f "$DISK_FILE" error "$FAIL" && exit 77 # shellcheck disable=SC2086 if ! qemu-img convert -f "$SOURCE_FMT" $CONV_FLAGS -o "$DISK_OPTS" -O "$DST_FMT" -- "$SOURCE_FILE" "$TMP_FILE"; then rm -f "$TMP_FILE" error "Failed to convert $DISK_DESC to $DST_FMT format in $DIR, is there enough space available?" && exit 79 fi else rm -f "$SOURCE_FILE" mv "$TMP_FILE" "$DST_FILE" # Check free diskspace SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1) SPACE_GB=$(( (SPACE + 1073741823)/1073741824 )) info "Conversion of $DISK_DESC to $DST_FMT completed succesfully!" if (( DATA_SIZE > SPACE )); then error "Not enough free space to create a $DISK_DESC of $DISK_SPACE in $DIR, it has only $SPACE_GB GB available.." error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting DISK_FMT to \"qcow2\"." && exit 76 fi # Create an empty file if ! fallocate -l "$DISK_SPACE" "$DISK_FILE"; then if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then rm -f "$DISK_FILE" error "$FAIL" && exit 77 fi fi fi ;; qcow2) local DISK_OPTS="$DISK_ALLOC" [ -n "$DISK_FLAGS" ] && DISK_OPTS="$DISK_OPTS,$DISK_FLAGS" if ! qemu-img create -f "$DISK_FMT" -o "$DISK_OPTS" -- "$DISK_FILE" "$DISK_SPACE" ; then rm -f "$DISK_FILE" error "$FAIL" && exit 70 fi ;; esac return 0 } addDisk () { Loading @@ -210,7 +259,7 @@ addDisk () { local DISK_ADDRESS=$7 local DISK_FMT=$8 local DISK_FILE="$DISK_BASE.$DISK_EXT" local FS DIR CUR_SIZE DATA_SIZE local DIR FS DATA_SIZE PREV_FMT PREV_EXT CUR_SIZE DIR=$(dirname "$DISK_FILE") [ ! -d "$DIR" ] && return 0 Loading @@ -229,7 +278,6 @@ addDisk () { fi if ! [ -f "$DISK_FILE" ] ; then local PREV_EXT PREV_FMT if [[ "${DISK_FMT,,}" != "raw" ]]; then PREV_FMT="raw" Loading @@ -237,24 +285,9 @@ addDisk () { PREV_FMT="qcow2" fi PREV_EXT="$(fmt2ext "$PREV_FMT")" local PREV_FILE="$DISK_BASE.$PREV_EXT" if [ -f "$PREV_FILE" ] ; then info "Detected that ${DISK_DESC^^}_FMT changed from \"$PREV_FMT\" to \"$DISK_FMT\"." info "Starting conversion of $DISK_DESC to this new format, please wait until completed..." local TMP_FILE="$DISK_BASE.tmp" rm -f "$TMP_FILE" if ! convertDisk "$PREV_FILE" "$PREV_FMT" "$TMP_FILE" "$DISK_FMT" ; then rm -f "$TMP_FILE" error "Failed to convert $DISK_DESC to $DISK_FMT format." && exit 79 fi mv "$TMP_FILE" "$DISK_FILE" rm -f "$PREV_FILE" info "Conversion of $DISK_DESC completed succesfully!" if [ -f "$DISK_BASE.$PREV_EXT" ] ; then convertDisk "$DISK_BASE.$PREV_EXT" "$PREV_FMT" "$DISK_FILE" "$DISK_FMT" "$DISK_BASE" "$DISK_DESC" || exit $? fi fi Loading @@ -262,8 +295,8 @@ addDisk () { CUR_SIZE=$(getSize "$DISK_FILE") if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then resizeDisk "$DISK_FILE" "$CUR_SIZE" "$DATA_SIZE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" || exit $? if (( DATA_SIZE > CUR_SIZE )); then resizeDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" || exit $? fi else Loading