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

Postpone (more) the swapfile creation

This commit is contained in:
Santiago Lo Coco 2022-01-03 19:49:21 -03:00
parent 12479b4b33
commit e9aba4cc6d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install.sh
View File

@ -124,7 +124,6 @@ getSize() {
while [ $(echo $size | awk '{ print $1 <= 0 }') -eq 1 ]; do while [ $(echo $size | awk '{ print $1 <= 0 }') -eq 1 ]; do
sizeStr=$(whiptail --inputbox "Size cannot be less than or equal to zero. Please enter a new size." 0 0 3>&1 1>&2 2>&3) sizeStr=$(whiptail --inputbox "Size cannot be less than or equal to zero. Please enter a new size." 0 0 3>&1 1>&2 2>&3)
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"
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) }')
done done
echo $size echo $size
@ -145,7 +144,6 @@ 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
} }
@ -177,6 +175,7 @@ mountPart() {
mount "$bootPart" /mnt/boot/efi 2>&1 | debug mount "$bootPart" /mnt/boot/efi 2>&1 | debug
fi fi
[ -n "$swapPart" ] && swapon "$swapPart" 2>&1 | debug [ -n "$swapPart" ] && swapon "$swapPart" 2>&1 | debug
[ -n "$swapfile" ] && createSwapfile
} }
debug() { debug() {