lvm and luks bugs fix

0-preinstall.sh

@@ -50,6 +50,31 @@ do_lvm() {
     done
 }
 
+do_partition() {
+    sgdisk -Z "$DISK"                                                     # zap all on disk
+    sgdisk -a 2048 -o "$DISK"                                             # new gpt disk 2048 alignment
+    sgdisk -n 1::+1M --typecode=1:ef02 --change-name=1:"BIOSBOOT" "$DISK" # partition 1 (BIOS Boot Partition)
+    sgdisk -n 2::+300M --typecode=2:ef00 --change-name=2:"$BOOT" "$DISK"  # partition 2 (UEFI Boot Partition)
+    sgdisk -n 3::-0 --typecode=3:8300 --change-name=3:"$ROOT" "$DISK"     # partition 3 (Root), default start, remaining
+    if [[ "$UEFI" -eq 0 ]]; then
+        sgdisk -A 1:set:2 "$DISK"
+    fi
+}
+
+do_format() {
+    if [[ $FS =~ "btrfs" ]]; then
+        do_btrfs "$ROOT" "$PART3"
+    else
+        mkfs."$FS" "$PART3" \
+                    "$([[ $FS == xfs || $FS == reiserfs ]] && echo "-f")" \
+                    "$([[ $FS == vfat ]] && echo "-F32")" \
+                    "$([[ $TRIM -eq 1 && $FS == ext4 ]] && echo "-E discard")"
+    fi
+
+}
+
+# format a partition from given list of filesystems
+
 logo
 title "Setting up mirrors for faster downloads"
 install_pkg pacman-contrib reflector rsync gptfdisk btrfs-progs
@@ -62,18 +87,6 @@ reflector --age 48 --country "$ISO" -f 5 --latest 20 --protocol https --sort rat
 mkdir /mnt &>/dev/null # Hiding error message if any
 
 title "Partitioning disk"
-# disk prep
-if [[ "$LAYOUT" -eq 1 ]]; then
-    sgdisk -Z "$DISK" # zap all on disk
-    sgdisk -a 2048 -o "$DISK" # new gpt disk 2048 alignment
-    sgdisk -n 1::+1M --typecode=1:ef02 --change-name=1:"BIOSBOOT" "$DISK" # partition 1 (BIOS Boot Partition)
-    sgdisk -n 2::+300M --typecode=2:ef00 --change-name=2:"$BOOT" "$DISK" # partition 2 (UEFI Boot Partition)
-    sgdisk -n 3::-0 --typecode=3:8300 --change-name=3:"$ROOT" "$DISK" # partition 3 (Root), default start, remaining
-
-    if [[ "$UEFI" -eq 0 ]]; then
-        sgdisk -A 1:set:2 "$DISK"
-    fi
-
 if [[ "$SDD" -eq 1 ]]; then
     PART2=${DISK}p2
     PART3=${DISK}p3
@@ -81,16 +94,22 @@ if [[ "$LAYOUT" -eq 1 ]]; then
     PART2=${DISK}2
     PART3=${DISK}3
 fi
-elif [[ "$LAYOUT" -eq 1 && "$DEFAULT" -eq 1 ]]; then
-    make_boot "$BOOT" "$PART2"
-    do_btrfs "$ROOT" "$PART3"
 
-elif [[ "$LAYOUT" -eq 1 && "$LVM" -eq 1 ]]; then
+if [[ "$LAYOUT" -eq 1 ]]; then
+    do_partition
+    make_boot "$BOOT" "$PART2"
+    do_format
+
+elif [[ "$LVM" -eq 1 ]]; then
+    do_partition
+    do_format
     pvcreate "$PART3"
     vgcreate "$LVM_VG" "$PART3"
     do_lvm
 
-elif [[ "$LAYOUT" -eq 1 && "$LUKS" -eq 1 && "$LVM" -eq 1  ]]; then
+elif [[ "$LUKS" -eq 1 ]]; then
+    do_partition
+    do_format
     # enter luks password to cryptsetup and format root partition
     echo -n "$LUKS_PASSWORD" | cryptsetup -y -v luksFormat "$PART3" -
     # open luks container and ROOT will be place holder

startup.sh

@@ -247,19 +247,16 @@ set_partion_layout() {
             case "$REPLY" in
             1)
                 set_option "LAYOUT" 1
-                set_option "DEFAULT" 1
                 break
                 ;;
             2)
                 set_lvm
-                set_option "LAYOUT" 1
                 set_option "LVM" 1
                 set_option "LUKS" 0
                 break
                 ;;
             3)
                 set_lvm
-                set_option "LAYOUT" 1
                 set_option "LUKS" 1
                 set_option "LVM" 1
                 set_option "LUKS_PATH" "/dev/mapper/ROOT"