From 36eeb1c80dc7424e5bf8db07ecd5c24fc43381d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Ke=C3=9Fler?= <git@maximilian-kessler.de>
Date: Mon, 25 Jul 2022 15:42:17 +0200
Subject: [PATCH] fix some bugs in installer

---
 installer/install-arch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/install-arch b/installer/install-arch
index 84f2584..78856d8 100755
--- a/installer/install-arch
+++ b/installer/install-arch
@@ -8,8 +8,6 @@ trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
 REPO_URL="https:mkessler-arch.maximilian-kessler.de"
 MIRRORLIST_URL="https://archlinux.org/mirrorlist/?country=DE&protocol=https&use_mirror_status=on"
 
-pacman -Sy --noconfirm pacman-contrib dialog
-
 echo "Updating mirror list"
 curl -s "$MIRRORLIST_URL" | \
     sed -e 's/^#Server/Server/' -e '/^#/d' | \
@@ -58,7 +56,9 @@ exec 2> >(tee "stderr.log")
 timedatectl set-ntp true
 
 ### Setup the disk and partitions ###
-swap_size=$(free --mebi | awk '/Mem:/ {print $2}')
+ram_size=$(free --mebi | awk '/Mem:/ {print $2}')
+swap_size=$((ram_size + 1024))M  # 1 Gigabyte more swap space than available ram
+root_size=60G
 
 # creates two partitions: one boot partition and another partition, filling the rest of space
 echo "Creating partitions on ${device}..."
@@ -83,7 +83,7 @@ wipefs "${part_luks}"
 
 echo "Setting up luks on ${part_luks}"
 echo "${password}" | cryptsetup luksFormat -q "${part_luks}"
-echo "${password}" | cryptsetup open "${part_luks}"
+echo "${password}" | cryptsetup open "${part_luks}" "${cryptlvm}"
 
 pvcreate "${mapped_device}"
 vgcreate "${vlgrp}" "${mapped_device}"