From 5bc0652193d318aa5c8f1cb8c2216df681931a0e Mon Sep 17 00:00:00 2001 From: Christian Harke Date: Fri, 22 Sep 2023 18:23:06 +0200 Subject: [PATCH] Make disk encryption optional --- lib/apps/nixos-install.sh | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/lib/apps/nixos-install.sh b/lib/apps/nixos-install.sh index baf39a3a..d3060152 100644 --- a/lib/apps/nixos-install.sh +++ b/lib/apps/nixos-install.sh @@ -95,11 +95,13 @@ partition() { } echo '12' -create_volumes() { - _log "[create_volumes] Encrypting LVM partition..." +encrypt_partition() { + _log "[encrypt_partition] Encrypting LVM partition..." cryptsetup luksFormat "${LVM_PARTITION}" cryptsetup luksOpen "${LVM_PARTITION}" "${LVM_PV}" +} +create_volumes() { _log "[create_volumes] Creating LVM volumes..." pvcreate "/dev/mapper/${LVM_PV}" vgcreate "${LVM_VG}" "/dev/mapper/${LVM_PV}" @@ -161,8 +163,21 @@ install() { echo '16' # shellcheck disable=SC2310 -if _read_boolean "Do you want to DELETE ALL PARTITIONS?" N; then +DO_PARTITION="$(_read_boolean "Do you want to DELETE ALL PARTITIONS?" N)" || true +readonly DO_PARTITION +if "${DO_PARTITION}"; then partition +fi + +echo '16-1' +# shellcheck disable=SC2310 +DO_ENCRYPT="$(_read_boolean "Do you want to ENCRYPT THE DISK?" N)" || true +readonly DO_ENCRYPT +if "${DO_ENCRYPT}"; then + encrypt_partition +fi + +if "${DO_PARTITION}"; then create_volumes create_filesystems fi @@ -178,7 +193,9 @@ fi echo '18' # shellcheck disable=SC2310 -if _read_boolean "Do you want to INSTALL NixOS now?" N; then +DO_INSTALL="$(_read_boolean "Do you want to INSTALL NixOS now?" N)" || true +readonly DO_INSTALL +if "${DO_INSTALL}"; then install fi