diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup index 40e0cf734..1ceb36e3b 100755 --- a/scripts/cloudron-setup +++ b/scripts/cloudron-setup @@ -20,7 +20,7 @@ readonly MINIMUM_MEMORY="990" # this is mostly reported for 1GB main memory # copied from cloudron-resize-fs.sh readonly physical_memory=$(free -m | awk '/Mem:/ { print $2 }') readonly disk_device="$(for d in $(find /dev -type b); do [ "$(mountpoint -d /)" = "$(mountpoint -x $d)" ] && echo $d && break; done)" -readonly disk_size_bytes=$(fdisk -l ${disk_device} | grep "Disk ${disk_device}" | awk '{ printf "%d", $5 }') +readonly disk_size_bytes=$(fdisk -l ${disk_device} | grep "Disk ${disk_device}" | awk '{ printf $5 }') readonly disk_size_gb=$((${disk_size_bytes}/1024/1024/1024)) # verify the system has minimum requirements met diff --git a/setup/start/cloudron-resize-fs.sh b/setup/start/cloudron-resize-fs.sh index 208ef16be..4e6443051 100755 --- a/setup/start/cloudron-resize-fs.sh +++ b/setup/start/cloudron-resize-fs.sh @@ -16,7 +16,7 @@ existing_swap=$(cat /proc/meminfo | grep SwapTotal | awk '{ printf "%.0f", $2/10 readonly physical_memory=$(free -m | awk '/Mem:/ { print $2 }') readonly swap_size=$((${physical_memory} - ${existing_swap})) # if you change this, fix enoughResourcesAvailable() in client.js readonly app_count=$((${physical_memory} / 200)) # estimated app count -readonly disk_size_bytes=$(fdisk -l ${disk_device} | grep "Disk ${disk_device}" | awk '{ printf "%d", $5 }') # can't rely on fdisk human readable units, using bytes instead +readonly disk_size_bytes=$(fdisk -l ${disk_device} | grep "Disk ${disk_device}" | awk '{ printf $5 }') # can't rely on fdisk human readable units, using bytes instead readonly disk_size=$((${disk_size_bytes}/1024/1024)) readonly system_size=10240 # 10 gigs for system libs, apps images, installer, box code, data and tmp readonly ext4_reserved=$((disk_size * 5 / 100)) # this can be changes using tune2fs -m percent /dev/vda1