In BIOS systems use MBR instead GPT

14 files changed, 226 insertions, 178 deletions

diff --git a/README.md b/README.md
index 873509f..35b8a9c 100644
--- a/README.md
+++ b/README.md
@@ -26,10 +26,10 @@ For new features, improvements and bugs fill an issue in GitHub or make a pull r
 
 ### Features
 
-* System: GPT, UEFI, BIOS
+* System: UEFI, BIOS
 * Storage: SATA, NVMe and MMC
 * Encryption: root partition encrypted and no encrypted
-* Partition: no LVM, LVM, LVM on LUKS
+* Partition: no LVM, LVM, LVM on LUKS, GPT on UEFI, MBR on BIOS
 * File system: ext4, btrfs (with subvols), xfs
 * Optional file swap (not supported in btrfs)
 * Storage: SATA, NVMe and MMC
diff --git a/alis-recovery.conf b/alis-recovery.conf
index 6e15daa..883a98a 100644
--- a/alis-recovery.conf
+++ b/alis-recovery.conf
@@ -8,9 +8,8 @@ LVM="true"
 LUKS_PASSWORD="archlinux"
 LUKS_PASSWORD_RETYPE="archlinux"
 PARTITION_MODE="auto !custom !manual"
-PARTITION_MANUAL_BIOS="!/dev/sda1"
-PARTITION_MANUAL_BOOT="!/dev/sda1 !/dev/sda2 !/dev/nvme0n1p1 !/dev/mmcblk0p1"
-PARTITION_MANUAL_ROOT="!/dev/sda2 !/dev/sda3 !/dev/nvme0n1p2 !/dev/mmcblk0p2"
+PARTITION_CUSTOMMANUAL_BOOT="!/dev/sda1 !/dev/nvme0n1p1 !/dev/mmcblk0p1"
+PARTITION_CUSTOMMANUAL_ROOT="!/dev/sda2 !/dev/nvme0n1p2 !/dev/mmcblk0p2"
 
 # network_install
 WIFI_INTERFACE=""
diff --git a/alis-recovery.sh b/alis-recovery.sh
index b7a072a..a0d3721 100644
--- a/alis-recovery.sh
+++ b/alis-recovery.sh
@@ -46,9 +46,10 @@ set -e
 # global variables (no configuration, don't edit)
 ASCIINEMA=""
 BIOS_TYPE=""
-PARTITION_BIOS=""
 PARTITION_BOOT=""
 PARTITION_ROOT=""
+PARTITION_BOOT_NUMBER=""
+PARTITION_ROOT_NUMBER=""
 DEVICE_ROOT=""
 DEVICE_LVM=""
 LUKS_DEVICE_NAME="cryptroot"
@@ -83,9 +84,8 @@ function configuration_install() {
 function sanitize_variables() {
     DEVICE=$(sanitize_variable "$DEVICE")
     PARTITION_MODE=$(sanitize_variable "$PARTITION_MODE")
-    PARTITION_BIOS=$(sanitize_variable "$PARTITION_BIOS")
-    PARTITION_BOOT=$(sanitize_variable "$PARTITION_BOOT")
-    PARTITION_ROOT=$(sanitize_variable "$PARTITION_ROOT")
+    PARTITION_CUSTOMMANUAL_BOOT=$(sanitize_variable "$PARTITION_CUSTOMMANUAL_BOOT")
+    PARTITION_CUSTOMMANUAL_ROOT=$(sanitize_variable "$PARTITION_CUSTOMMANUAL_ROOT")
 }
 
 function sanitize_variable() {
@@ -103,6 +103,14 @@ function check_variables() {
     check_variables_boolean "LVM" "$LVM"
     check_variables_equals "LUKS_PASSWORD" "LUKS_PASSWORD_RETYPE" "$LUKS_PASSWORD" "$LUKS_PASSWORD_RETYPE"
     check_variables_list "PARTITION_MODE" "$PARTITION_MODE" "auto custom manual" "true"
+    if [ "$PARTITION_MODE" == "custom" ]; then
+        check_variables_value "PARTITION_CUSTOM_PARTED_UEFI" "$PARTITION_CUSTOM_PARTED_UEFI"
+        check_variables_value "PARTITION_CUSTOM_PARTED_BIOS" "$PARTITION_CUSTOM_PARTED_BIOS"
+    fi
+    if [ "$PARTITION_MODE" == "custom" -o "$PARTITION_MODE" == "manual" ]; then
+        check_variables_value "PARTITION_CUSTOMMANUAL_BOOT" "$PARTITION_CUSTOMMANUAL_BOOT"
+        check_variables_value "PARTITION_CUSTOMMANUAL_ROOT" "$PARTITION_CUSTOMMANUAL_ROOT"
+    fi
     if [ "$LVM" == "true" ]; then
         check_variables_list "PARTITION_MODE" "$PARTITION_MODE" "auto" "true"
     fi
@@ -215,32 +223,6 @@ function facts() {
 }
 
 function check_facts() {
-    if [ "$BIOS_TYPE" == "bios" ]; then
-        if [ "$DEVICE" == "/dev/sda" ]; then
-            PARTITION_BIOS="/dev/sda1"
-            PARTITION_BOOT="/dev/sda2"
-            PARTITION_ROOT="/dev/sda3"
-        elif [ "$DEVICE" == "/dev/nvme0n1" ]; then
-            PARTITION_BIOS="/dev/nvme0n1p1"
-            PARTITION_BOOT="/dev/nvme0n1p2"
-            PARTITION_ROOT="/dev/nvme0n1p3"
-        elif [ "$DEVICE" == "/dev/mmcblk0" ]; then
-            PARTITION_BIOS="/dev/mmcblk0p1"
-            PARTITION_BOOT="/dev/mmcblk0p2"
-            PARTITION_ROOT="/dev/mmcblk0p3"
-        fi
-    elif [ "$BIOS_TYPE" == "uefi" ]; then
-        if [ "$DEVICE" == "/dev/sda" ]; then
-            PARTITION_BOOT="/dev/sda1"
-            PARTITION_ROOT="/dev/sda2"
-        elif [ "$DEVICE" == "/dev/nvme0n1" ]; then
-            PARTITION_BOOT="/dev/nvme0n1p1"
-            PARTITION_ROOT="/dev/nvme0n1p2"
-        elif [ "$DEVICE" == "/dev/mmcblk0" ]; then
-            PARTITION_BOOT="/dev/mmcblk0p1"
-            PARTITION_ROOT="/dev/mmcblk0p2"
-        fi
-    fi
 }
 
 function prepare() {
@@ -292,67 +274,66 @@ function configure_network() {
 
 function partition() {
     # setup
-    if [ -n "$PARTITION_MANUAL_BIOS" ]; then
-        PARTITION_BIOS=$PARTITION_MANUAL_BIOS
-    fi
-    if [ -n "$PARTITION_MANUAL_BOOT" ]; then
-        PARTITION_BOOT=$PARTITION_MANUAL_BOOT
-    fi
-    if [ -n "$PARTITION_MANUAL_ROOT" ]; then
-        PARTITION_ROOT=$PARTITION_MANUAL_ROOT
-    fi
-
     if [ "$PARTITION_MODE" == "auto" ]; then
         if [ "$BIOS_TYPE" == "uefi" ]; then
             if [ "$DEVICE_SATA" == "true" ]; then
                 PARTITION_BOOT="${DEVICE}1"
                 PARTITION_ROOT="${DEVICE}2"
-                #PARTITION_BOOT_NUMBER=1
                 DEVICE_ROOT="${DEVICE}2"
             fi
 
             if [ "$DEVICE_NVME" == "true" ]; then
                 PARTITION_BOOT="${DEVICE}p1"
                 PARTITION_ROOT="${DEVICE}p2"
-                #PARTITION_BOOT_NUMBER=1
                 DEVICE_ROOT="${DEVICE}p2"
             fi
 
             if [ "$DEVICE_MMC" == "true" ]; then
                 PARTITION_BOOT="${DEVICE}p1"
                 PARTITION_ROOT="${DEVICE}p2"
-                #PARTITION_BOOT_NUMBER=1
                 DEVICE_ROOT="${DEVICE}p2"
             fi
         fi
 
         if [ "$BIOS_TYPE" == "bios" ]; then
             if [ "$DEVICE_SATA" == "true" ]; then
-                PARTITION_BIOS="${DEVICE}1"
-                PARTITION_BOOT="${DEVICE}2"
-                PARTITION_ROOT="${DEVICE}3"
-                #PARTITION_BOOT_NUMBER=2
-                DEVICE_ROOT="${DEVICE}3"
+                PARTITION_BOOT="${DEVICE}1"
+                PARTITION_ROOT="${DEVICE}2"
+                DEVICE_ROOT="${DEVICE}2"
             fi
 
             if [ "$DEVICE_NVME" == "true" ]; then
-                PARTITION_BIOS="${DEVICE}p1"
-                PARTITION_BOOT="${DEVICE}p2"
-                PARTITION_ROOT="${DEVICE}p3"
-                #PARTITION_BOOT_NUMBER=2
-                DEVICE_ROOT="${DEVICE}p3"
+                PARTITION_BOOT="${DEVICE}p1"
+                PARTITION_ROOT="${DEVICE}p2"
+                DEVICE_ROOT="${DEVICE}p2"
             fi
 
             if [ "$DEVICE_MMC" == "true" ]; then
-                PARTITION_BIOS="${DEVICE}p1"
-                PARTITION_BOOT="${DEVICE}p2"
-                PARTITION_ROOT="${DEVICE}p3"
-                #PARTITION_BOOT_NUMBER=2
-                DEVICE_ROOT="${DEVICE}p3"
+                PARTITION_BOOT="${DEVICE}p1"
+                PARTITION_ROOT="${DEVICE}p2"
+                DEVICE_ROOT="${DEVICE}p2"
             fi
         fi
+    elif [ "$PARTITION_MODE" == "custom" ]; then
+        PARTITION_PARTED_UEFI="$PARTITION_CUSTOM_PARTED_UEFI"
+        PARTITION_PARTED_BIOS="$PARTITION_CUSTOM_PARTED_BIOS"
     fi
 
+    if [ "$PARTITION_MODE" == "custom" -o "$PARTITION_MODE" == "manual" ]; then
+        PARTITION_BOOT="$PARTITION_CUSTOMMANUAL_BOOT"
+        PARTITION_ROOT="$PARTITION_CUSTOMMANUAL_ROOT"
+        DEVICE_ROOT="${PARTITION_ROOT}"
+    fi
+
+    PARTITION_BOOT_NUMBER="$PARTITION_BOOT"
+    PARTITION_ROOT_NUMBER="$PARTITION_ROOT"
+    PARTITION_BOOT_NUMBER="${PARTITION_BOOT_NUMBER//\/dev\/sda/}"
+    PARTITION_BOOT_NUMBER="${PARTITION_BOOT_NUMBER//\/dev\/nvme0n1p/}"
+    PARTITION_BOOT_NUMBER="${PARTITION_BOOT_NUMBER//\/dev\/mmcblk0p/}"
+    PARTITION_ROOT_NUMBER="${PARTITION_ROOT_NUMBER//\/dev\/sda/}"
+    PARTITION_ROOT_NUMBER="${PARTITION_ROOT_NUMBER//\/dev\/nvme0n1p/}"
+    PARTITION_ROOT_NUMBER="${PARTITION_ROOT_NUMBER//\/dev\/mmcblk0p/}"
+
     # luks and lvm
     if [ -n "$LUKS_PASSWORD" ]; then
         echo -n "$LUKS_PASSWORD" | cryptsetup --key-file=- open $PARTITION_ROOT $LUKS_DEVICE_NAME
diff --git a/alis.conf b/alis.conf
index 8efe59e..02b38c4 100644
--- a/alis.conf
+++ b/alis.conf
@@ -16,11 +16,10 @@ LUKS_PASSWORD_RETYPE="archlinux"
 FILE_SYSTEM_TYPE="ext4 !btrfs !xfs" # (single)
 SWAP_SIZE="!2GiB !4GiB !8GiB" # (single)
 PARTITION_MODE="auto !custom !manual"
-PARTITION_CUSTOM_PARTED_UEFI="mklabel gpt mkpart primary fat32 1MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on"
-PARTITION_CUSTOM_PARTED_BIOS="mklabel gpt mkpart primary fat32 1MiB 128MiB mkpart primary $FILE_SYSTEM_TYPE 128MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on"
-PARTITION_MANUAL_BIOS="!/dev/sda1"
-PARTITION_MANUAL_BOOT="!/dev/sda1 !/dev/sda2 !/dev/nvme0n1p1 !/dev/mmcblk0p1"
-PARTITION_MANUAL_ROOT="!/dev/sda2 !/dev/sda3 !/dev/nvme0n1p2 !/dev/mmcblk0p2"
+PARTITION_CUSTOM_PARTED_UEFI="mklabel gpt mkpart primary fat32 1MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot"
+PARTITION_CUSTOM_PARTED_BIOS="mklabel msdos mkpart primary ext4 4MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on"
+PARTITION_CUSTOMMANUAL_BOOT="!/dev/sda1 !/dev/nvme0n1p1 !/dev/mmcblk0p1"
+PARTITION_CUSTOMMANUAL_ROOT="!/dev/sda2 !/dev/nvme0n1p2 !/dev/mmcblk0p2"
 
 # network_install
 WIFI_INTERFACE=""
diff --git a/alis.sh b/alis.sh
index 28b01b4..341e856 100644
--- a/alis.sh
+++ b/alis.sh
@@ -42,9 +42,10 @@ set -e
 # global variables (no configuration, don't edit)
 ASCIINEMA=""
 BIOS_TYPE=""
-PARTITION_BIOS=""
 PARTITION_BOOT=""
 PARTITION_ROOT=""
+PARTITION_BOOT_NUMBER=""
+PARTITION_ROOT_NUMBER=""
 DEVICE_ROOT=""
 DEVICE_LVM=""
 LUKS_DEVICE_NAME="cryptroot"
@@ -86,9 +87,8 @@ function configuration_install() {
 function sanitize_variables() {
     DEVICE=$(sanitize_variable "$DEVICE")
     PARTITION_MODE=$(sanitize_variable "$PARTITION_MODE")
-    PARTITION_BIOS=$(sanitize_variable "$PARTITION_BIOS")
-    PARTITION_BOOT=$(sanitize_variable "$PARTITION_BOOT")
-    PARTITION_ROOT=$(sanitize_variable "$PARTITION_ROOT")
+    PARTITION_CUSTOMMANUAL_BOOT=$(sanitize_variable "$PARTITION_CUSTOMMANUAL_BOOT")
+    PARTITION_CUSTOMMANUAL_ROOT=$(sanitize_variable "$PARTITION_CUSTOMMANUAL_ROOT")
     FILE_SYSTEM_TYPE=$(sanitize_variable "$FILE_SYSTEM_TYPE")
     SWAP_SIZE=$(sanitize_variable "$SWAP_SIZE")
     KERNELS=$(sanitize_variable "$KERNELS")
@@ -120,8 +120,14 @@ function check_variables() {
     check_variables_list "FILE_SYSTEM_TYPE" "$FILE_SYSTEM_TYPE" "ext4 btrfs xfs"
     check_variables_equals "LUKS_PASSWORD" "LUKS_PASSWORD_RETYPE" "$LUKS_PASSWORD" "$LUKS_PASSWORD_RETYPE"
     check_variables_list "PARTITION_MODE" "$PARTITION_MODE" "auto custom manual" "true"
-    check_variables_value "PARTITION_CUSTOM_PARTED_UEFI" "$PARTITION_CUSTOM_PARTED_UEFI"
-    check_variables_value "PARTITION_CUSTOM_PARTED_BIOS" "$PARTITION_CUSTOM_PARTED_BIOS"
+    if [ "$PARTITION_MODE" == "custom" ]; then
+        check_variables_value "PARTITION_CUSTOM_PARTED_UEFI" "$PARTITION_CUSTOM_PARTED_UEFI"
+        check_variables_value "PARTITION_CUSTOM_PARTED_BIOS" "$PARTITION_CUSTOM_PARTED_BIOS"
+    fi
+    if [ "$PARTITION_MODE" == "custom" -o "$PARTITION_MODE" == "manual" ]; then
+        check_variables_value "PARTITION_CUSTOMMANUAL_BOOT" "$PARTITION_CUSTOMMANUAL_BOOT"
+        check_variables_value "PARTITION_CUSTOMMANUAL_ROOT" "$PARTITION_CUSTOMMANUAL_ROOT"
+    fi
     if [ "$LVM" == "true" ]; then
         check_variables_list "PARTITION_MODE" "$PARTITION_MODE" "auto" "true"
     fi
@@ -278,33 +284,6 @@ function check_facts() {
     if [ "$BIOS_TYPE" == "bios" ]; then
         check_variables_list "BOOTLOADER" "$BOOTLOADER" "grub"
     fi
-
-    if [ "$BIOS_TYPE" == "bios" ]; then
-        if [ "$DEVICE" == "/dev/sda" ]; then
-            PARTITION_BIOS="/dev/sda1"
-            PARTITION_BOOT="/dev/sda2"
-            PARTITION_ROOT="/dev/sda3"
-        elif [ "$DEVICE" == "/dev/nvme0n1" ]; then
-            PARTITION_BIOS="/dev/nvme0n1p1"
-            PARTITION_BOOT="/dev/nvme0n1p2"
-            PARTITION_ROOT="/dev/nvme0n1p3"
-        elif [ "$DEVICE" == "/dev/mmcblk0" ]; then
-            PARTITION_BIOS="/dev/mmcblk0p1"
-            PARTITION_BOOT="/dev/mmcblk0p2"
-            PARTITION_ROOT="/dev/mmcblk0p3"
-        fi
-    elif [ "$BIOS_TYPE" == "uefi" ]; then
-        if [ "$DEVICE" == "/dev/sda" ]; then
-            PARTITION_BOOT="/dev/sda1"
-            PARTITION_ROOT="/dev/sda2"
-        elif [ "$DEVICE" == "/dev/nvme0n1" ]; then
-            PARTITION_BOOT="/dev/nvme0n1p1"
-            PARTITION_ROOT="/dev/nvme0n1p2"
-        elif [ "$DEVICE" == "/dev/mmcblk0" ]; then
-            PARTITION_BOOT="/dev/mmcblk0p1"
-            PARTITION_ROOT="/dev/mmcblk0p2"
-        fi
-    fi
 }
 
 function prepare() {
@@ -368,76 +347,69 @@ function partition() {
     print_step "partition()"
 
     # setup
-    if [ -n "$PARTITION_MANUAL_BIOS" ]; then
-        PARTITION_BIOS=$PARTITION_MANUAL_BIOS
-    fi
-    if [ -n "$PARTITION_MANUAL_BOOT" ]; then
-        PARTITION_BOOT=$PARTITION_MANUAL_BOOT
-    fi
-    if [ -n "$PARTITION_MANUAL_ROOT" ]; then
-        PARTITION_ROOT=$PARTITION_MANUAL_ROOT
-    fi
-
-    PARTITION_PARTED_UEFI="mklabel gpt mkpart primary fat32 1MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on"
-    PARTITION_PARTED_BIOS="mklabel gpt mkpart primary fat32 1MiB 128MiB mkpart primary $FILE_SYSTEM_TYPE 128MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on"
-
     if [ "$PARTITION_MODE" == "auto" ]; then
+        PARTITION_PARTED_UEFI="mklabel gpt mkpart primary fat32 1MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on"
+        PARTITION_PARTED_BIOS="mklabel msdos mkpart primary ext4 4MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on"
+
         if [ "$BIOS_TYPE" == "uefi" ]; then
             if [ "$DEVICE_SATA" == "true" ]; then
                 PARTITION_BOOT="${DEVICE}1"
                 PARTITION_ROOT="${DEVICE}2"
-                #PARTITION_BOOT_NUMBER=1
                 DEVICE_ROOT="${DEVICE}2"
             fi
 
             if [ "$DEVICE_NVME" == "true" ]; then
                 PARTITION_BOOT="${DEVICE}p1"
                 PARTITION_ROOT="${DEVICE}p2"
-                #PARTITION_BOOT_NUMBER=1
                 DEVICE_ROOT="${DEVICE}p2"
             fi
 
             if [ "$DEVICE_MMC" == "true" ]; then
                 PARTITION_BOOT="${DEVICE}p1"
                 PARTITION_ROOT="${DEVICE}p2"
-                #PARTITION_BOOT_NUMBER=1
                 DEVICE_ROOT="${DEVICE}p2"
             fi
         fi
 
         if [ "$BIOS_TYPE" == "bios" ]; then
             if [ "$DEVICE_SATA" == "true" ]; then
-                PARTITION_BIOS="${DEVICE}1"
-                PARTITION_BOOT="${DEVICE}2"
-                PARTITION_ROOT="${DEVICE}3"
-                #PARTITION_BOOT_NUMBER=2
-                DEVICE_ROOT="${DEVICE}3"
+                PARTITION_BOOT="${DEVICE}1"
+                PARTITION_ROOT="${DEVICE}2"
+                DEVICE_ROOT="${DEVICE}2"
             fi
 
             if [ "$DEVICE_NVME" == "true" ]; then
-                PARTITION_BIOS="${DEVICE}p1"
-                PARTITION_BOOT="${DEVICE}p2"
-                PARTITION_ROOT="${DEVICE}p3"
-                #PARTITION_BOOT_NUMBER=2
-                DEVICE_ROOT="${DEVICE}p3"
+                PARTITION_BOOT="${DEVICE}p1"
+                PARTITION_ROOT="${DEVICE}p2"
+                DEVICE_ROOT="${DEVICE}p2"
             fi
 
             if [ "$DEVICE_MMC" == "true" ]; then
-                PARTITION_BIOS="${DEVICE}p1"
-                PARTITION_BOOT="${DEVICE}p2"
-                PARTITION_ROOT="${DEVICE}p3"
-                #PARTITION_BOOT_NUMBER=2
-                DEVICE_ROOT="${DEVICE}p3"
+                PARTITION_BOOT="${DEVICE}p1"
+                PARTITION_ROOT="${DEVICE}p2"
+                DEVICE_ROOT="${DEVICE}p2"
             fi
         fi
     elif [ "$PARTITION_MODE" == "custom" ]; then
-        PARTITION_PARTED_UEFI=$PARTITION_CUSTOM_PARTED_UEFI
-        PARTITION_PARTED_BIOS=$PARTITION_CUSTOM_PARTED_BIOS
-        DEVICE_ROOT="${PARTITION_ROOT}"
-    elif [ "$PARTITION_MODE" == "manual" ]; then
+        PARTITION_PARTED_UEFI="$PARTITION_CUSTOM_PARTED_UEFI"
+        PARTITION_PARTED_BIOS="$PARTITION_CUSTOM_PARTED_BIOS"
+    fi
+
+    if [ "$PARTITION_MODE" == "custom" -o "$PARTITION_MODE" == "manual" ]; then
+        PARTITION_BOOT="$PARTITION_CUSTOMMANUAL_BOOT"
+        PARTITION_ROOT="$PARTITION_CUSTOMMANUAL_ROOT"
         DEVICE_ROOT="${PARTITION_ROOT}"
     fi
 
+    PARTITION_BOOT_NUMBER="$PARTITION_BOOT"
+    PARTITION_ROOT_NUMBER="$PARTITION_ROOT"
+    PARTITION_BOOT_NUMBER="${PARTITION_BOOT_NUMBER//\/dev\/sda/}"
+    PARTITION_BOOT_NUMBER="${PARTITION_BOOT_NUMBER//\/dev\/nvme0n1p/}"
+    PARTITION_BOOT_NUMBER="${PARTITION_BOOT_NUMBER//\/dev\/mmcblk0p/}"
+    PARTITION_ROOT_NUMBER="${PARTITION_ROOT_NUMBER//\/dev\/sda/}"
+    PARTITION_ROOT_NUMBER="${PARTITION_ROOT_NUMBER//\/dev\/nvme0n1p/}"
+    PARTITION_ROOT_NUMBER="${PARTITION_ROOT_NUMBER//\/dev\/mmcblk0p/}"
+
     # partition
     if [ "$FILE_SYSTEM_TYPE" == "f2fs" ]; then
         pacman -S f2fs-tools
@@ -452,23 +424,16 @@ function partition() {
         if [ "$BIOS_TYPE" == "uefi" ]; then
             parted -s $DEVICE $PARTITION_PARTED_UEFI
 
-            if [ "$PARTITION_MODE" == "auto" ]; then
-                sgdisk -t=1:ef00 $DEVICE
-                if [ "$LVM" == "true" ]; then
-                    sgdisk -t=2:8e00 $DEVICE
-                fi
+            sgdisk -t=$PARTITION_BOOT_NUMBER:ef00 $DEVICE
+            if [ -n "$LUKS_PASSWORD" ]; then
+                sgdisk -t=$PARTITION_ROOT_NUMBER:8309 $DEVICE
+            elif [ "$LVM" == "true" ]; then
+                sgdisk -t=$PARTITION_ROOT_NUMBER:8e00 $DEVICE
             fi
         fi
 
         if [ "$BIOS_TYPE" == "bios" ]; then
             parted -s $DEVICE $PARTITION_PARTED_BIOS
-
-            if [ "$PARTITION_MODE" == "auto" ]; then
-                sgdisk -t=1:ef02 $DEVICE
-                if [ "$LVM" == "true" ]; then
-                    sgdisk -t=3:8e00 $DEVICE
-                fi
-            fi
         fi
     fi
 
@@ -507,10 +472,8 @@ function partition() {
     fi
 
     if [ "$BIOS_TYPE" == "bios" ]; then
-        wipefs -a $PARTITION_BIOS
         wipefs -a $PARTITION_BOOT
         wipefs -a $DEVICE_ROOT
-        mkfs.fat -n BIOS -F32 $PARTITION_BIOS
         mkfs."$FILE_SYSTEM_TYPE" -L boot $PARTITION_BOOT
         mkfs."$FILE_SYSTEM_TYPE" -L root $DEVICE_ROOT
     fi
diff --git a/packer/alis-packer-bios-ext4-grub-luks-lvm.json b/packer/alis-packer-bios-ext4-grub-luks-lvm.json
new file mode 100644
index 0000000..448f005
--- /dev/null
+++ b/packer/alis-packer-bios-ext4-grub-luks-lvm.json
@@ -0,0 +1,53 @@
+{
+    "variables": {
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.04.01-x86_64.iso",
+      "disk_size": "16384"
+    },
+    "builders": [
+      {
+        "name": "archlinux-alis-virtualbox",
+        "type": "virtualbox-iso",
+        "guest_os_type": "ArchLinux_64",
+        "guest_additions_mode": "attach",
+        "headless": false,
+        "http_directory": ".",
+        "vboxmanage": [
+          ["modifyvm", "{{.Name}}", "--memory", "2048"],
+          ["modifyvm", "{{.Name}}", "--vram", "128"],
+          ["modifyvm", "{{.Name}}", "--cpus", "2"],
+          ["modifyvm", "{{.Name}}", "--firmware", "bios"]
+        ],
+        "disk_size": "{{user `disk_size`}}",
+        "hard_drive_interface": "sata",
+        "iso_url": "{{user `iso`}}",
+        "iso_checksum": "bbece70b6e6a3f1d5f90a7d330657ea3c9280355",
+        "iso_checksum_type": "sha1",
+        "ssh_username": "vagrant",
+        "ssh_password": "vagrant",
+        "ssh_wait_timeout": "60m",
+        "boot_wait": "5s",
+        "boot_command": [
+          "<wait5s><enter>",
+          "<wait40s>",
+          "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.conf<enter><wait1s>",
+          "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.sh<enter><wait1s>",
+          "sed -i \"s/FILE_SYSTEM_TYPE=.*/FILE_SYSTEM_TYPE=\\\"ext4\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LVM=.*/LVM=\\\"true\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/BOOTLOADER=.*/BOOTLOADER=\\\"grub\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/DESKTOP_ENVIRONMENT=.*/DESKTOP_ENVIRONMENT=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "chmod +x ./alis.sh<enter><wait1s>",
+          "./alis.sh<enter><wait3>y<wait1s><enter>",
+          "<wait10s><wait10s><wait10s><wait10s><wait10s><wait10s><wait10s><wait60m>"
+        ],
+        "shutdown_command": "systemctl poweroff"
+      }
+    ],
+    "post-processors": [
+      {
+        "type": "vagrant",
+        "output": "archlinux-alis-{{.BuildName}}.box"
+      }
+    ]
+  }
\ No newline at end of file
diff --git a/packer/alis-packer-bios-ext4-grub.json b/packer/alis-packer-bios-ext4-grub.json
new file mode 100644
index 0000000..e5bfc88
--- /dev/null
+++ b/packer/alis-packer-bios-ext4-grub.json
@@ -0,0 +1,53 @@
+{
+    "variables": {
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.04.01-x86_64.iso",
+      "disk_size": "16384"
+    },
+    "builders": [
+      {
+        "name": "archlinux-alis-virtualbox",
+        "type": "virtualbox-iso",
+        "guest_os_type": "ArchLinux_64",
+        "guest_additions_mode": "attach",
+        "headless": false,
+        "http_directory": ".",
+        "vboxmanage": [
+          ["modifyvm", "{{.Name}}", "--memory", "2048"],
+          ["modifyvm", "{{.Name}}", "--vram", "128"],
+          ["modifyvm", "{{.Name}}", "--cpus", "2"],
+          ["modifyvm", "{{.Name}}", "--firmware", "bios"]
+        ],
+        "disk_size": "{{user `disk_size`}}",
+        "hard_drive_interface": "sata",
+        "iso_url": "{{user `iso`}}",
+        "iso_checksum": "bbece70b6e6a3f1d5f90a7d330657ea3c9280355",
+        "iso_checksum_type": "sha1",
+        "ssh_username": "vagrant",
+        "ssh_password": "vagrant",
+        "ssh_wait_timeout": "60m",
+        "boot_wait": "5s",
+        "boot_command": [
+          "<wait5s><enter>",
+          "<wait40s>",
+          "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.conf<enter><wait1s>",
+          "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.sh<enter><wait1s>",
+          "sed -i \"s/FILE_SYSTEM_TYPE=.*/FILE_SYSTEM_TYPE=\\\"ext4\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LVM=.*/LVM=\\\"false\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/BOOTLOADER=.*/BOOTLOADER=\\\"grub\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/DESKTOP_ENVIRONMENT=.*/DESKTOP_ENVIRONMENT=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "chmod +x ./alis.sh<enter><wait1s>",
+          "./alis.sh<enter><wait3>y<wait1s><enter>",
+          "<wait10s><wait10s><wait10s><wait10s><wait10s><wait10s><wait10s><wait60m>"
+        ],
+        "shutdown_command": "systemctl poweroff"
+      }
+    ],
+    "post-processors": [
+      {
+        "type": "vagrant",
+        "output": "archlinux-alis-{{.BuildName}}.box"
+      }
+    ]
+  }
\ No newline at end of file
diff --git a/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json b/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json
index 522bca9..772c0ea 100644
--- a/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json
+++ b/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json
@@ -1,6 +1,6 @@
 {
     "variables": {
-      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso",
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.04.01-x86_64.iso",
       "disk_size": "16384"
     },
     "builders": [
@@ -20,7 +20,7 @@
         "disk_size": "{{user `disk_size`}}",
         "hard_drive_interface": "sata",
         "iso_url": "{{user `iso`}}",
-        "iso_checksum": "69f18631dd1518e1efa596497399d668e6fc63e6",
+        "iso_checksum": "bbece70b6e6a3f1d5f90a7d330657ea3c9280355",
         "iso_checksum_type": "sha1",
         "ssh_username": "vagrant",
         "ssh_password": "vagrant",
@@ -32,8 +32,8 @@
           "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.sh<enter><wait1s>",
           "sed -i \"s/^FILE_SYSTEM_TYPE=.*/FILE_SYSTEM_TYPE=\\\"btrfs\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/^LVM=.*/LVM=\\\"true\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/^LUKS_PASSWORD_PASSWORD=.*/LUKS_PASSWORD_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/^LUKS_PASSWORD_PASSWORD_RETYPE=.*/LUKS_PASSWORD_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/^LUKS_PASSWORD=.*/LUKS_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/^LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/^BOOTLOADER=.*/BOOTLOADER=\\\"systemd\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/^DESKTOP_ENVIRONMENT=.*/DESKTOP_ENVIRONMENT=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/^AUR=.*/AUR=\\\"yay\\\"/\" ./alis.conf<enter><wait1s>",
diff --git a/packer/alis-packer-efi-ext4-grub-gnome.json b/packer/alis-packer-efi-ext4-grub-gnome.json
index 75cbb79..d46da37 100644
--- a/packer/alis-packer-efi-ext4-grub-gnome.json
+++ b/packer/alis-packer-efi-ext4-grub-gnome.json
@@ -1,6 +1,6 @@
 {
     "variables": {
-      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso",
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.04.01-x86_64.iso",
       "disk_size": "16384"
     },
     "builders": [
@@ -20,7 +20,7 @@
         "disk_size": "{{user `disk_size`}}",
         "hard_drive_interface": "sata",
         "iso_url": "{{user `iso`}}",
-        "iso_checksum": "69f18631dd1518e1efa596497399d668e6fc63e6",
+        "iso_checksum": "bbece70b6e6a3f1d5f90a7d330657ea3c9280355",
         "iso_checksum_type": "sha1",
         "ssh_username": "vagrant",
         "ssh_password": "vagrant",
@@ -32,8 +32,8 @@
           "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.sh<enter><wait1s>",
           "sed -i \"s/FILE_SYSTEM_TYPE=.*/FILE_SYSTEM_TYPE=\\\"ext4\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/LVM=.*/LVM=\\\"false\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD=.*/LUKS_PASSWORD_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD_RETYPE=.*/LUKS_PASSWORD_PASSWORD_RETYPE=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/BOOTLOADER=.*/BOOTLOADER=\\\"grub\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/DESKTOP_ENVIRONMENT=.*/DESKTOP_ENVIRONMENT=\\\"gnome\\\"/\" ./alis.conf<enter><wait1s>",
           "chmod +x ./alis.sh<enter><wait1s>",
diff --git a/packer/alis-packer-efi-ext4-grub-kde.json b/packer/alis-packer-efi-ext4-grub-kde.json
index e0c6163..4c57632 100644
--- a/packer/alis-packer-efi-ext4-grub-kde.json
+++ b/packer/alis-packer-efi-ext4-grub-kde.json
@@ -1,6 +1,6 @@
 {
     "variables": {
-      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso",
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.04.01-x86_64.iso",
       "disk_size": "16384"
     },
     "builders": [
@@ -20,7 +20,7 @@
         "disk_size": "{{user `disk_size`}}",
         "hard_drive_interface": "sata",
         "iso_url": "{{user `iso`}}",
-        "iso_checksum": "69f18631dd1518e1efa596497399d668e6fc63e6",
+        "iso_checksum": "bbece70b6e6a3f1d5f90a7d330657ea3c9280355",
         "iso_checksum_type": "sha1",
         "ssh_username": "vagrant",
         "ssh_password": "vagrant",
@@ -31,8 +31,8 @@
           "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.conf<enter><wait1s>",
           "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.sh<enter><wait1s>",
           "sed -i \"s/LVM=.*/LVM=\\\"false\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD=.*/LUKS_PASSWORD_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD_RETYPE=.*/LUKS_PASSWORD_PASSWORD_RETYPE=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/BOOTLOADER=.*/BOOTLOADER=\\\"grub\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/DESKTOP_ENVIRONMENT=.*/DESKTOP_ENVIRONMENT=\\\"kde\\\"/\" ./alis.conf<enter><wait1s>",
           "chmod +x ./alis.sh<enter><wait1s>",
diff --git a/packer/alis-packer-efi-ext4-grub-xfce.json b/packer/alis-packer-efi-ext4-grub-xfce.json
index 0135fed..aa2e183 100644
--- a/packer/alis-packer-efi-ext4-grub-xfce.json
+++ b/packer/alis-packer-efi-ext4-grub-xfce.json
@@ -1,6 +1,6 @@
 {
     "variables": {
-      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso",
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.04.01-x86_64.iso",
       "disk_size": "16384"
     },
     "builders": [
@@ -20,7 +20,7 @@
         "disk_size": "{{user `disk_size`}}",
         "hard_drive_interface": "sata",
         "iso_url": "{{user `iso`}}",
-        "iso_checksum": "69f18631dd1518e1efa596497399d668e6fc63e6",
+        "iso_checksum": "bbece70b6e6a3f1d5f90a7d330657ea3c9280355",
         "iso_checksum_type": "sha1",
         "ssh_username": "vagrant",
         "ssh_password": "vagrant",
@@ -31,8 +31,8 @@
           "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.conf<enter><wait1s>",
           "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.sh<enter><wait1s>",
           "sed -i \"s/LVM=.*/LVM=\\\"false\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD=.*/LUKS_PASSWORD_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD_RETYPE=.*/LUKS_PASSWORD_PASSWORD_RETYPE=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/BOOTLOADER=.*/BOOTLOADER=\\\"grub\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/DESKTOP_ENVIRONMENT=.*/DESKTOP_ENVIRONMENT=\\\"xfce\\\"/\" ./alis.conf<enter><wait1s>",
           "chmod +x ./alis.sh<enter><wait1s>",
diff --git a/packer/alis-packer-efi-ext4-luks-grub.json b/packer/alis-packer-efi-ext4-luks-grub.json
index b566ec0..b8bb1dd 100644
--- a/packer/alis-packer-efi-ext4-luks-grub.json
+++ b/packer/alis-packer-efi-ext4-luks-grub.json
@@ -1,6 +1,6 @@
 {
     "variables": {
-      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso",
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.04.01-x86_64.iso",
       "disk_size": "16384"
     },
     "builders": [
@@ -20,7 +20,7 @@
         "disk_size": "{{user `disk_size`}}",
         "hard_drive_interface": "sata",
         "iso_url": "{{user `iso`}}",
-        "iso_checksum": "69f18631dd1518e1efa596497399d668e6fc63e6",
+        "iso_checksum": "bbece70b6e6a3f1d5f90a7d330657ea3c9280355",
         "iso_checksum_type": "sha1",
         "ssh_username": "vagrant",
         "ssh_password": "vagrant",
@@ -32,8 +32,8 @@
           "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.sh<enter><wait1s>",
           "sed -i \"s/FILE_SYSTEM_TYPE=.*/FILE_SYSTEM_TYPE=\\\"ext4\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/LVM=.*/LVM=\\\"false\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD=.*/LUKS_PASSWORD_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD_RETYPE=.*/LUKS_PASSWORD_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/BOOTLOADER=.*/BOOTLOADER=\\\"grub\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/DESKTOP_ENVIRONMENT=.*/DESKTOP_ENVIRONMENT=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
           "chmod +x ./alis.sh<enter><wait1s>",
diff --git a/packer/alis-packer-efi-ext4-luks-lvm-grub.json b/packer/alis-packer-efi-ext4-luks-lvm-grub.json
index 3731cbb..5550d05 100644
--- a/packer/alis-packer-efi-ext4-luks-lvm-grub.json
+++ b/packer/alis-packer-efi-ext4-luks-lvm-grub.json
@@ -1,6 +1,6 @@
 {
     "variables": {
-      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso",
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.04.01-x86_64.iso",
       "disk_size": "16384"
     },
     "builders": [
@@ -20,7 +20,7 @@
         "disk_size": "{{user `disk_size`}}",
         "hard_drive_interface": "sata",
         "iso_url": "{{user `iso`}}",
-        "iso_checksum": "69f18631dd1518e1efa596497399d668e6fc63e6",
+        "iso_checksum": "bbece70b6e6a3f1d5f90a7d330657ea3c9280355",
         "iso_checksum_type": "sha1",
         "ssh_username": "vagrant",
         "ssh_password": "vagrant",
@@ -32,8 +32,8 @@
           "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.sh<enter><wait1s>",
           "sed -i \"s/FILE_SYSTEM_TYPE=.*/FILE_SYSTEM_TYPE=\\\"ext4\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/LVM=.*/LVM=\\\"true\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD=.*/LUKS_PASSWORD_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD_RETYPE=.*/LUKS_PASSWORD_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/BOOTLOADER=.*/BOOTLOADER=\\\"grub\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/DESKTOP_ENVIRONMENT=.*/DESKTOP_ENVIRONMENT=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
           "chmod +x ./alis.sh<enter><wait1s>",
diff --git a/packer/alis-packer-efi-ext4-luks-lvm-systemd.json b/packer/alis-packer-efi-ext4-luks-lvm-systemd.json
index 73f9af8..fcf97eb 100644
--- a/packer/alis-packer-efi-ext4-luks-lvm-systemd.json
+++ b/packer/alis-packer-efi-ext4-luks-lvm-systemd.json
@@ -1,6 +1,6 @@
 {
     "variables": {
-      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.01-x86_64.iso",
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.04.01-x86_64.iso",
       "disk_size": "16384"
     },
     "builders": [
@@ -20,7 +20,7 @@
         "disk_size": "{{user `disk_size`}}",
         "hard_drive_interface": "sata",
         "iso_url": "{{user `iso`}}",
-        "iso_checksum": "69f18631dd1518e1efa596497399d668e6fc63e6",
+        "iso_checksum": "bbece70b6e6a3f1d5f90a7d330657ea3c9280355",
         "iso_checksum_type": "sha1",
         "ssh_username": "vagrant",
         "ssh_password": "vagrant",
@@ -32,8 +32,8 @@
           "wget http://{{.HTTPIP}}:{{.HTTPPort}}/alis.sh<enter><wait1s>",
           "sed -i \"s/FILE_SYSTEM_TYPE=.*/FILE_SYSTEM_TYPE=\\\"ext4\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/LVM=.*/LVM=\\\"true\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD=.*/LUKS_PASSWORD_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/LUKS_PASSWORD_PASSWORD_RETYPE=.*/LUKS_PASSWORD_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
+          "sed -i \"s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/BOOTLOADER=.*/BOOTLOADER=\\\"systemd\\\"/\" ./alis.conf<enter><wait1s>",
           "sed -i \"s/DESKTOP_ENVIRONMENT=.*/DESKTOP_ENVIRONMENT=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
           "chmod +x ./alis.sh<enter><wait1s>",