|
|
@@ -39,7 +39,6 @@ function preChrootStep {
|
|
|
|
|
|
printf "Arch installation\n"
|
|
|
read -p "System drive: " DISK
|
|
|
- read -p
|
|
|
read -p "Hostname: " HOSTNAME
|
|
|
read -p "Username: " USERNAME
|
|
|
PASSWORD=$(openssl passwd -6) || exit $?
|
|
|
@@ -93,10 +92,10 @@ function preChrootStep {
|
|
|
ROOTPART="${DISK}p2"
|
|
|
|
|
|
printf "Creating LUKS2 container\n" | tee -a $LOGFILE
|
|
|
- cryptsetup luksFormat --type luks2 ${ROOTPART} >> $LOGFILE 2>&1 || exit $?
|
|
|
+ cryptsetup luksFormat --type luks2 ${ROOTPART} 2>&1 | tee -a $LOGFILE || exit $?
|
|
|
|
|
|
printf "Decrypt LUKS2 container\n" | tee -a $LOGFILE
|
|
|
- cryptsetup open ${ROOTPART} cryptlvm >> $LOGFILE 2>&1 || exit $?
|
|
|
+ cryptsetup open ${ROOTPART} cryptlvm 2>&1 | tee -a $LOGFILE || exit $?
|
|
|
|
|
|
printf "Setup LVM volumes\n" | tee -a $LOGFILE
|
|
|
pvcreate /dev/mapper/cryptlvm >> $LOGFILE 2>&1 || exit $?
|
|
|
@@ -110,8 +109,8 @@ function preChrootStep {
|
|
|
|
|
|
printf "Mount filesystems\n" | tee -a $LOGFILE
|
|
|
mount /dev/VolGroup1/root /mnt
|
|
|
- mkdir -p /mnt/efi
|
|
|
- mount ${BOOTPART} /mnt/efi
|
|
|
+ mkdir -p /mnt/boot
|
|
|
+ mount ${BOOTPART} /mnt/boot
|
|
|
|
|
|
printf "Creating swap file\n" | tee -a $LOGFILE
|
|
|
SWAPSIZE=$(free --giga | grep Mem: | awk '{printf "%dG", $2 * 1.5}')
|