From e2a316f6b76597dfef33831d729e244b0c3384f4 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Thu, 15 Apr 2021 10:09:17 +0200
Subject: [PATCH] fixes

---
 modules/disk/bios/postconfig | 12 +++++++++---
 modules/disk/uefi/postconfig | 19 +++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/modules/disk/bios/postconfig b/modules/disk/bios/postconfig
index 517fbc1..e12ae17 100644
--- a/modules/disk/bios/postconfig
+++ b/modules/disk/bios/postconfig
@@ -18,7 +18,7 @@ if [[ -n "${cfg[wipe]}" ]]; then
 	w
 	q" | fdisk "${cfg[diskname]}" > /dev/null
 fi
-
+sleep 2
 if [[ "${cfg[fde_key_store]}" == "once" ]]; then
 	echo "create bootpartition"
 	target_boot="${cfg[diskname]}1"
@@ -30,6 +30,7 @@ if [[ "${cfg[fde_key_store]}" == "once" ]]; then
 	a
 	w
 	q" | fdisk "${cfg[diskname]}" > /dev/null
+	sleep 2
 	if [[ "${cfg[rootfssize]}" == "rest" ]]; then
 		target_partition_tmp="${cfg[diskname]}2"
 		echo "create rootfs"
@@ -76,22 +77,27 @@ else
 	q" | fdisk "${cfg[diskname]}" > /dev/null
 	fi
 fi
-
+sleep 2
 
 target_partition="${target_partition_tmp}"
 if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
 	echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
+	sleep 1
 	echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
+	sleep 1
         #echo -n "oem" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
         #echo -n "oem" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
 	target_partition="/dev/mapper/voidluks-${diskid}"
 fi
 
 mkswap "${target_partition}"
-
+sleep 1
 vgcreate -q -f "voidvg.${diskid}" "${target_partition}" || exit 1
+sleep 1
 lvcreate -q -y --name swap -L "${cfg[swapsize]}"G "voidvg.${diskid}"
+sleep 1
 lvcreate -q -y --name root -l 100%FREE "voidvg.${diskid}"
+sleep 1
 mkfs.btrfs -q -f "/dev/mapper/voidvg.${diskid}-root"
 mkswap "/dev/mapper/voidvg.${diskid}-swap"
 mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"
diff --git a/modules/disk/uefi/postconfig b/modules/disk/uefi/postconfig
index b244c77..9a69e86 100644
--- a/modules/disk/uefi/postconfig
+++ b/modules/disk/uefi/postconfig
@@ -4,13 +4,6 @@ fi
 
 module start "disk" "Partition disk"
 
-
-#umounter "${dest}" || exit
-
-#if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
-#	addpkg cryptsetup
-#fi
-
 diskid="${cfg[diskid]//-/_}"
 if [[ -n "${cfg[wipe]}" ]]; then
 	echo "Formatting disk"
@@ -24,7 +17,7 @@ if [[ -n "${cfg[wipe]}" ]]; then
 	w
 	q" | fdisk "${cfg[diskname]}" > /dev/null
 fi
-
+sleep 2
 if [[ "${cfg[fde_key_store]}" == "once" ]]; then
 	echo "create bootpartition"
 	target_boot="${cfg[diskname]}2"
@@ -34,6 +27,7 @@ if [[ "${cfg[fde_key_store]}" == "once" ]]; then
 	+${cfg[bootsize]}G
 	w
 	q" | fdisk "${cfg[diskname]}" > /dev/null
+	sleep 2
 	if [[ "${cfg[rootfssize]}" == "rest" ]]; then
 		target_partition_tmp="${cfg[diskname]}3"
 		echo "create rootfs"
@@ -76,22 +70,27 @@ else
 	q" | fdisk "${cfg[diskname]}" > /dev/null
 	fi
 fi
-
+sleep 2
 
 target_partition="${target_partition_tmp}"
 if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
 	echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
+	sleep 1
 	echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
+	sleep 1
         #echo -n "oem" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
         #echo -n "oem" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
 	target_partition="/dev/mapper/voidluks-${diskid}"
 fi
 
 mkswap "${target_partition}"
-
+sleep 1
 vgcreate -q -f "voidvg.${diskid}" "${target_partition}" || exit 1
+sleep 1
 lvcreate -q -y --name swap -L "${cfg[swapsize]}"G "voidvg.${diskid}"
+sleep 1
 lvcreate -q -y --name root -l 100%FREE "voidvg.${diskid}"
+sleep 1
 mkfs.btrfs -q -f "/dev/mapper/voidvg.${diskid}-root"
 mkswap "/dev/mapper/voidvg.${diskid}-swap"
 mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"