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

---
 main.sh                    | 2 +-
 modules/10-disk/preinstall | 8 ++++----
 modules/30-users/post      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main.sh b/main.sh
index 0f563b5..ef3de1e 100755
--- a/main.sh
+++ b/main.sh
@@ -42,6 +42,6 @@ for i in $(seq 1 "${users[amount]}"); do
 	pw+=( "${users[pw$i]}" )
 done
 
-chroot "${dest}" "/tmp/installer/run_in_chroot.sh" "${cfg[diskpw]}" "${pw[@]}"
+chroot "${dest}" "/tmp/installer/run_in_chroot.sh" "${pw[@]}" "${cfg[diskpw]}"
 
 umounter "${dest}"
diff --git a/modules/10-disk/preinstall b/modules/10-disk/preinstall
index 5a68f44..eaeefe8 100644
--- a/modules/10-disk/preinstall
+++ b/modules/10-disk/preinstall
@@ -80,10 +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 "oem" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
-        echo -n "oem" | 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 5b16f3f..597195a 100644
--- a/modules/30-users/post
+++ b/modules/30-users/post
@@ -12,8 +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 "oem\noem" | 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..