From 227daeb5ab7f55b5f6d6605fa7f22f402df1982b Mon Sep 17 00:00:00 2001 From: teldra Date: Fri, 12 Mar 2021 22:47:34 +0100 Subject: [PATCH] small fix --- modules/10-disk/install | 2 +- modules/60-de/pre | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/10-disk/install b/modules/10-disk/install index a97e9d7..283e30d 100644 --- a/modules/10-disk/install +++ b/modules/10-disk/install @@ -80,7 +80,7 @@ fi target_partition="${target_partition_tmp}" -if [[ ! "${fde_key_store}" == "none" ]]; then +if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d - echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d - target_partition="/dev/mapper/voidluks-${diskid}" diff --git a/modules/60-de/pre b/modules/60-de/pre index a4417b7..0c57cf3 100644 --- a/modules/60-de/pre +++ b/modules/60-de/pre @@ -2,7 +2,10 @@ module "start" "de" "Desktopenvironment Configure" setconf "add" "gfx_system" "xorg" multiplechoice "de" "kde5" "i3wm" "gnome" "none" -multiplechoice "gfx_hardware" "amd" "nvidia" "intel" "none" + +if [[ ! "${cfg[de]}" == "none" ]]; then + multiplechoice "gfx_hardware" "amd" "nvidia" "intel" "none" +fi if [[ "${cfg[de]}" == "gnome" ]]; then setconf add "dm" "gdm"