slococo
/
calsais
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Postpone swapfile creation

This commit is contained in:
Santiago Lo Coco 2022-01-03 19:42:47 -03:00
parent 8477e48cde
commit 12479b4b33
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install.sh
View File

@ -82,14 +82,14 @@ partDisks() {
whiptail --yesno "Do you want to create a swapfile?" 0 0 whiptail --yesno "Do you want to create a swapfile?" 0 0
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
size=$(getSize "swapfile") size=$(getSize "swapfile")
createSwapfile $size swapfile=/mnt/swapfile
fi fi
fi fi
else else
whiptail --yesno "Do you want to create a swapfile?" 0 0 whiptail --yesno "Do you want to create a swapfile?" 0 0
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
size=$(getSize "swapfile") size=$(getSize "swapfile")
createSwapfile $size swapfile=/mnt/swapfile
fi fi
fi fi
else else
@ -106,7 +106,7 @@ partDisks() {
swapPart=${disk}2 swapPart=${disk}2
rootPart=${disk}3 rootPart=${disk}3
else else
createSwapfile $size swapfile=/mnt/swapfile
fi fi
fi fi
@ -126,14 +126,12 @@ getSize() {
exitIfCancel "You must enter a size." "partDisks" exitIfCancel "You must enter a size." "partDisks"
#calcHeightAndRun "whiptail --inputbox \"Size cannot be less than or equal to zero. Please enter a new size.\" HEIGHT 60 3>&1 1>&2 2>&3" #calcHeightAndRun "whiptail --inputbox \"Size cannot be less than or equal to zero. Please enter a new size.\" HEIGHT 60 3>&1 1>&2 2>&3"
size=$(echo "$sizeStr" | grep -Eo '[-]?[0-9]+([.,]?[0-9]+)?' | head -n1 | sed 's/,/./g' | awk '{ print int($1 * 1024) }') size=$(echo "$sizeStr" | grep -Eo '[-]?[0-9]+([.,]?[0-9]+)?' | head -n1 | sed 's/,/./g' | awk '{ print int($1 * 1024) }')
echo $size | awk '{ print $1 <= 0 }'
done done
echo $size echo $size
} }
createSwapfile() { createSwapfile() {
swapfile=/mnt/swapfile dd if=/dev/zero of=$swapfile bs=1M count=${size} status=progress
dd if=/dev/zero of=$swapfile bs=1M count=$1 status=progress
chmod 600 $swapfile chmod 600 $swapfile
mkswap $swapfile mkswap $swapfile
swapon $swapfile swapon $swapfile
@ -147,6 +145,7 @@ autoPart() {
sgdisk $disk -n=2:0:+${size}G -t=2:8200 2>&1 | debug sgdisk $disk -n=2:0:+${size}G -t=2:8200 2>&1 | debug
sgdisk $disk -n=3:0:0 2>&1 | debug sgdisk $disk -n=3:0:0 2>&1 | debug
else else
[ -n "$swapfile" ] && createSwapfile
sgdisk $disk -n=2:0:0 2>&1 | debug sgdisk $disk -n=2:0:0 2>&1 | debug
fi fi
} }