From dcc26b67a632ffc1e5dc99148af157ad0f8cdade Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 5 Jan 2024 02:27:15 +0100
Subject: [PATCH] fix: Diskspace check (#541)

* fix: Diskspace check
---
 src/install.sh | 61 ++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/install.sh b/src/install.sh
index eca793a..04efca1 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -3,7 +3,7 @@ set -Eeuo pipefail
 
 : ${URL:=''}    # URL of the PAT file to be downloaded.
 
-if [ -f "$STORAGE"/dsm.ver ]; then
+if [ -f "$STORAGE/dsm.ver" ]; then
   BASE=$(cat "$STORAGE/dsm.ver")
 else
   # Fallback for old installs
@@ -37,44 +37,46 @@ fi
 BASE=$(basename "$URL" .pat)
 
 if [[ "$URL" != "file://$STORAGE/$BASE.pat" ]]; then
-  rm -f "$STORAGE"/"$BASE".pat
+  rm -f "$STORAGE/$BASE.pat"
 fi
 
-rm -f "$STORAGE"/"$BASE".agent
-rm -f "$STORAGE"/"$BASE".boot.img
-rm -f "$STORAGE"/"$BASE".system.img
+rm -f "$STORAGE/$BASE.agent"
+rm -f "$STORAGE/$BASE.boot.img"
+rm -f "$STORAGE/$BASE.system.img"
 
 [[ "$DEBUG" == [Yy1]* ]] && set -x
 
 # Check filesystem
-MIN_ROOT=471859200
-MIN_SPACE=6442450944
 FS=$(stat -f -c %T "$STORAGE")
 
 if [[ "${FS,,}" == "overlay"* ]]; then
   info "Warning: the filesystem of $STORAGE is OverlayFS, this usually means it was binded to an invalid path!"
 fi
 
-if [[ "${FS,,}" != "fat"* && "${FS,,}" != "vfat"* && "${FS,,}" != "exfat"* && \
-        "${FS,,}" != "ntfs"* && "${FS,,}" != "fuse"* && "${FS,,}" != "msdos"* ]]; then
+if [[ "${FS,,}" != "fat"* && "${FS,,}" != "vfat"* && "${FS,,}" != "exfat"* && "${FS,,}" != "ntfs"* && "${FS,,}" != "msdos"* ]]; then
   TMP="$STORAGE/tmp"
 else
   TMP="/tmp/dsm"
+  TMP_SPACE=2147483648
   SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
-  if (( MIN_SPACE > SPACE )); then
-    error "The ${FS^^} filesystem of $STORAGE does not support UNIX permissions, and no space left in container!" && exit 93
+  SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+  if (( TMP_SPACE > SPACE )); then
+    error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 2 GB." && exit 93
   fi
 fi
 
 rm -rf "$TMP" && mkdir -p "$TMP"
 
 # Check free diskspace
+ROOT_SPACE=536870912
 SPACE=$(df --output=avail -B 1 / | tail -n 1)
-(( MIN_ROOT > SPACE )) && error "Not enough free space in container root, need at least 450 MB available." && exit 96
+SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 500 MB." && exit 96
 
+MIN_SPACE=8589934592
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
 SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB GB available but need at least 6 GB." && exit 94
+(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB GB available but need at least 8 GB." && exit 94
 
 # Check if output is to interactive TTY
 if [ -t 1 ]; then
@@ -213,19 +215,22 @@ BOOT=$(find "$TMP" -name "*.bin.zip")
 BOOT=$(echo "$BOOT" | head -c -5)
 unzip -q -o "$BOOT".zip -d "$TMP"
 
-SYSTEM="$TMP/sys.img"
-SYSTEM_SIZE=4954537983
+SYSTEM="$STORAGE/$BASE.system.img"
 rm -f "$SYSTEM"
 
 # Check free diskspace
-SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1)
-SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-(( SYSTEM_SIZE > SPACE )) && error "Not enough free space to create a 4 GB system disk, have only $SPACE_GB GB available." && exit 97
+SYSTEM_SIZE=4954537983
+SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
+SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+
+if (( SYSTEM_SIZE > SPACE )); then
+  error "Not enough free space in $STORAGE to create a 5 GB system disk, have only $SPACE_MB MB available." && exit 97
+fi
 
 if ! touch "$SYSTEM"; then
   error "Could not create file $SYSTEM for the system disk." && exit 98
 fi
-  
+
 if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then
   { chattr +C "$SYSTEM"; } || :
   FA=$(lsattr "$SYSTEM")
@@ -241,17 +246,6 @@ if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM"; then
   fi
 fi
 
-# Check if file exists
-[ ! -f "$SYSTEM" ] && error "System disk does not exist ($SYSTEM)" && exit 99
-
-# Check the filesize
-SIZE=$(stat -c%s "$SYSTEM")
-
-if [[ SIZE -ne SYSTEM_SIZE ]]; then
-  rm -f "$SYSTEM"
-  error "System disk has the wrong size: $SIZE vs $SYSTEM_SIZE" && exit 90
-fi
-
 PART="$TMP/partition.fdisk"
 
 {       echo "label: dos"
@@ -318,16 +312,15 @@ fi
 
 rm -rf "$MOUNT"
 
-echo "$BASE" > "$STORAGE"/dsm.ver
+echo "$BASE" > "$STORAGE/dsm.ver"
 
 if [[ "$URL" == "file://$STORAGE/$BASE.pat" ]]; then
   rm -f "$PAT"
 else
-  mv -f "$PAT" "$STORAGE"/"$BASE".pat
+  mv -f "$PAT" "$STORAGE/$BASE.pat"
 fi
 
-mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img
-mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img
+mv -f "$BOOT" "$STORAGE/$BASE.boot.img"
 
 rm -rf "$TMP"