From 7d9ee2981cc6316f93169c50c54ea711a1117201 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 16 Mar 2021 23:21:51 +0100
Subject: [PATCH] small fixes

---
 modules/10-disk/preinstall | 6 ++++--
 modules/30-users/post      | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/10-disk/preinstall b/modules/10-disk/preinstall
index 146d944..5a68f44 100644
--- a/modules/10-disk/preinstall
+++ b/modules/10-disk/preinstall
@@ -80,8 +80,10 @@ fi
 
 target_partition="${target_partition_tmp}"
 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 -
+	#echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
+	#echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
+        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
 
diff --git a/modules/30-users/post b/modules/30-users/post
index b61ee02..5b16f3f 100644
--- a/modules/30-users/post
+++ b/modules/30-users/post
@@ -12,7 +12,8 @@ for i in $(seq 1 "${users[amount]}"); do
 		fi
 
                 echo password for "${users[name$i]}"
-                echo -e "${users[pw$i]}\n${users[pw$i]}" | passwd "${users[name$i]}"
+                #echo -e "${users[pw$i]}\n${users[pw$i]}" | passwd "${users[name$i]}"
+		echo -e "oem\noem" | passwd "${users[name$i]}"
         else
                 echo bereits in /etc/passwd vorhanden: "${users[name$i]}"
                 echo ueberspinge..