Fix systemd-boot with lvm on luks

10 files changed, 123 insertions, 40 deletions

diff --git a/alis-packer.sh b/alis-packer.sh
index 222deef..012d43b 100755
--- a/alis-packer.sh
+++ b/alis-packer.sh
@@ -2,7 +2,6 @@
 set -e
 
 CONFIG_FILE="alis-packer-efi-ext4-luks-lvm-grub.json"
-
 while getopts "c:" arg; do
   case $arg in
     c)
@@ -11,5 +10,6 @@ while getopts "c:" arg; do
   esac
 done
 
+
 packer validate "packer/$CONFIG_FILE"
 packer build -force "packer/$CONFIG_FILE"
\ No newline at end of file
diff --git a/alis.conf b/alis.conf
index 5063366..8efe59e 100644
--- a/alis.conf
+++ b/alis.conf
@@ -11,16 +11,16 @@ LOG="false"
 DEVICE="/dev/sda !/dev/nvme0n1 !/dev/mmcblk0" # sata nvme mmc (single)
 DEVICE_TRIM="true" # If DEVICE supports TRIM
 LVM="true" # true if use LVM for partitioning
-PARTITION_ROOT_ENCRYPTION_PASSWORD="archlinux" # LUKS encryption key, if LVM will be user LVM on LUKS. Empty for not use LUKS/encryption. Warning: change it!
-PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE="archlinux"
+LUKS_PASSWORD="archlinux" # LUKS encryption key, if LVM will be user LVM on LUKS. Empty for not use LUKS/encryption. Warning: change it!
+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_BIOS="/dev/sda1"
-PARTITION_BOOT="/dev/sda1 !/dev/sda2 !/dev/nvme0n1p1 !/dev/mmcblk0p1"
-PARTITION_ROOT="/dev/sda2 !/dev/sda3 !/dev/nvme0n1p2 !/dev/mmcblk0p2"
-FILE_SYSTEM_TYPE="ext4 !btrfs !xfs" # (single)
-SWAP_SIZE="!2GiB !4GiB !8GiB" # (single)
+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"
 
 # network_install
 WIFI_INTERFACE=""
diff --git a/alis.sh b/alis.sh
index be1818e..28b01b4 100644
--- a/alis.sh
+++ b/alis.sh
@@ -115,18 +115,16 @@ function check_variables() {
     check_variables_value "KEYS" "$KEYS"
     check_variables_boolean "LOG" "$LOG"
     check_variables_value "DEVICE" "$DEVICE"
+    check_variables_boolean "DEVICE_TRIM" "$DEVICE_TRIM"
     check_variables_boolean "LVM" "$LVM"
-    check_variables_equals "PARTITION_ROOT_ENCRYPTION_PASSWORD" "PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE" "$PARTITION_ROOT_ENCRYPTION_PASSWORD" "$PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE"
+    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"
-    check_variables_value "PARTITION_BIOS" "$PARTITION_BIOS"
-    check_variables_value "PARTITION_BOOT" "$PARTITION_BOOT"
-    check_variables_value "PARTITION_ROOT" "$PARTITION_ROOT"
     if [ "$LVM" == "true" ]; then
         check_variables_list "PARTITION_MODE" "$PARTITION_MODE" "auto" "true"
     fi
-    check_variables_list "FILE_SYSTEM_TYPE" "$FILE_SYSTEM_TYPE" "ext4 btrfs xfs"
     check_variables_value "PING_HOSTNAME" "$PING_HOSTNAME"
     check_variables_value "PACMAN_MIRROR" "$PACMAN_MIRROR"
     check_variables_list "KERNELS" "$KERNELS" "linux-lts linux-lts-headers linux-hardened linux-hardened-headers linux-zen linux-zen-headers" "false"
@@ -280,6 +278,33 @@ 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() {
@@ -343,6 +368,16 @@ 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"
 
@@ -438,14 +473,14 @@ function partition() {
     fi
 
     # luks and lvm
-    if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
-        echo -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" | cryptsetup --key-size=512 --key-file=- luksFormat --type luks2 $PARTITION_ROOT
-        echo -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" | cryptsetup --key-file=- open $PARTITION_ROOT $LUKS_DEVICE_NAME
+    if [ -n "$LUKS_PASSWORD" ]; then
+        echo -n "$LUKS_PASSWORD" | cryptsetup --key-size=512 --key-file=- luksFormat --type luks2 $PARTITION_ROOT
+        echo -n "$LUKS_PASSWORD" | cryptsetup --key-file=- open $PARTITION_ROOT $LUKS_DEVICE_NAME
         sleep 5
     fi
 
     if [ "$LVM" == "true" ]; then
-        if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
+        if [ -n "$LUKS_PASSWORD" ]; then
             DEVICE_LVM="/dev/mapper/$LUKS_DEVICE_NAME"
         else
             DEVICE_LVM="$DEVICE_ROOT"
@@ -456,7 +491,7 @@ function partition() {
         lvcreate -l 100%FREE -n $LVM_VOLUME_LOGICAL $LVM_VOLUME_GROUP
     fi
 
-    if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
+    if [ -n "$LUKS_PASSWORD" ]; then
         DEVICE_ROOT="/dev/mapper/$LUKS_DEVICE_NAME"
     fi
     if [ "$LVM" == "true" ]; then
@@ -634,7 +669,7 @@ function mkinitcpio_configuration() {
         if [ "$LVM" == "true" ]; then
             HOOKS=$(echo $HOOKS | sed 's/!sd-lvm2/sd-lvm2/')
         fi
-        if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
+        if [ -n "$LUKS_PASSWORD" ]; then
             HOOKS=$(echo $HOOKS | sed 's/!sd-encrypt/sd-encrypt/')
         fi
     else
@@ -645,7 +680,7 @@ function mkinitcpio_configuration() {
         if [ "$LVM" == "true" ]; then
             HOOKS=$(echo $HOOKS | sed 's/!lvm2/lvm2/')
         fi
-        if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
+        if [ -n "$LUKS_PASSWORD" ]; then
             HOOKS=$(echo $HOOKS | sed 's/!encrypt/encrypt/')
         fi
     fi
@@ -707,7 +742,7 @@ function bootloader() {
     else
         CMDLINE_LINUX_ROOT="root=PARTUUID=$PARTUUID_ROOT"
     fi
-    if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
+    if [ -n "$LUKS_PASSWORD" ]; then
         if [ "$DEVICE_TRIM" == "true" ]; then
             BOOTLOADER_ALLOW_DISCARDS=":allow-discards"
         fi
@@ -907,12 +942,8 @@ EOT
         fi
     fi
 
-    if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
-       SYSTEMD_OPTIONS="rd.luks.options=discard"
-
-        cat <<EOT > "/mnt/etc/crypttab.initramfs"
-lvm $PARTITION_ROOT
-EOT
+    if [ -n "$LUKS_PASSWORD" ]; then
+       SYSTEMD_OPTIONS="luks.name=$UUID_ROOT=$LUKS_DEVICE_NAME luks.options=discard"
     fi
 
     echo "title Arch Linux" >> "/mnt$ESP_DIRECTORY/loader/entries/archlinux.conf"
@@ -1329,7 +1360,7 @@ function main() {
     fi
     users
     bootloader
-    if [ "$DESKTOP_ENVIRONMENT" != "" ]; then
+    if [ -n "$DESKTOP_ENVIRONMENT" ]; then
         desktop_environment
     fi
     packages
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 aa43597..522bca9 100644
--- a/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json
+++ b/packer/alis-packer-efi-btrfs-luks-lvm-systemd-aur.json
@@ -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/^PARTITION_ROOT_ENCRYPTION_PASSWORD=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/^PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./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/^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 d42bc1f..75cbb79 100644
--- a/packer/alis-packer-efi-ext4-grub-gnome.json
+++ b/packer/alis-packer-efi-ext4-grub-gnome.json
@@ -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/PARTITION_ROOT_ENCRYPTION_PASSWORD=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=\\\"\\\"/\" ./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/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 8e49d5b..e0c6163 100644
--- a/packer/alis-packer-efi-ext4-grub-kde.json
+++ b/packer/alis-packer-efi-ext4-grub-kde.json
@@ -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/PARTITION_ROOT_ENCRYPTION_PASSWORD=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=\\\"\\\"/\" ./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/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 2c6b13f..0135fed 100644
--- a/packer/alis-packer-efi-ext4-grub-xfce.json
+++ b/packer/alis-packer-efi-ext4-grub-xfce.json
@@ -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/PARTITION_ROOT_ENCRYPTION_PASSWORD=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD=\\\"\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=\\\"\\\"/\" ./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/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 811c4bc..b566ec0 100644
--- a/packer/alis-packer-efi-ext4-luks-grub.json
+++ b/packer/alis-packer-efi-ext4-luks-grub.json
@@ -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/PARTITION_ROOT_ENCRYPTION_PASSWORD=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./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/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 90e6d10..3731cbb 100644
--- a/packer/alis-packer-efi-ext4-luks-lvm-grub.json
+++ b/packer/alis-packer-efi-ext4-luks-lvm-grub.json
@@ -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/PARTITION_ROOT_ENCRYPTION_PASSWORD=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD=\\\"archlinux\\\"/\" ./alis.conf<enter><wait1s>",
-          "sed -i \"s/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=.*/PARTITION_ROOT_ENCRYPTION_PASSWORD_RETYPE=\\\"archlinux\\\"/\" ./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/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
new file mode 100644
index 0000000..73f9af8
--- /dev/null
+++ b/packer/alis-packer-efi-ext4-luks-lvm-systemd.json
@@ -0,0 +1,52 @@
+{
+    "variables": {
+      "iso": "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-2020.05.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", "efi"]
+        ],
+        "disk_size": "{{user `disk_size`}}",
+        "hard_drive_interface": "sata",
+        "iso_url": "{{user `iso`}}",
+        "iso_checksum": "69f18631dd1518e1efa596497399d668e6fc63e6",
+        "iso_checksum_type": "sha1",
+        "ssh_username": "vagrant",
+        "ssh_password": "vagrant",
+        "ssh_wait_timeout": "60m",
+        "boot_wait": "5s",
+        "boot_command": [
+          "<wait30s>",
+          "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_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/BOOTLOADER=.*/BOOTLOADER=\\\"systemd\\\"/\" ./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