small fixes

main.sh

@@ -38,6 +38,10 @@ cp -rf "${modules}" "${dest}"/tmp/installer
 cp -rf "${functions}" "${dest}"/tmp/installer
 cp -rf ./run_in_chroot.sh "${dest}"/tmp/installer
 
-chroot "${dest}" "/tmp/installer/run_in_chroot.sh"
+for i in $(seq 1 "${users[amount]}"); do
+	pw+=( "${i}" )
+done
+
+chroot "${dest}" "/tmp/installer/run_in_chroot.sh" "${cfg[diskpw]}" "${pw[@]}"
 
 #umounter "${dest}"

modules/10-disk/pre

@@ -106,7 +106,8 @@ if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
 	addpkg "cryptsetup"
 	#input_pw "Disk Password"
 	output="oem"
-	setconf "add" "diskpw" "${output}"
+	#setconf "add" "diskpw" "${output}"
+	cfg+=( "${output}" )
 fi
 
 if check yesno "Do you want to hibernate?" "y"; then

modules/30-users/pre

@@ -64,7 +64,8 @@ while echo $((index++)) > /dev/null; do
 	
 	#input_pw "User ${users[name${counter}]} password"
 	output="oem"
-	useradder "pw" "${counter}" "${output}"
+	#useradder "pw" "${counter}" "${output}"
+	users+=( [pw${counter}]="${output}" )
 
 	if [[ "${standalone}" == "1" ]]; then
 		if ! yesno "More users?" "n"; then

run_in_chroot.sh

@@ -17,6 +17,12 @@ for i in $(find "${vars}" -type f); do
 	echo "${i}"
 	source "${i}"
 done
+cfg+=( [diskpw]="${1}" )
+
+input="${@}"
+for i in $(seq 1 "${#input[@]}"); do
+	[[ ! "${i}" == "1" ]] && users+=( [pw$i]="${input[$i]}" )
+done
 
 export run="install"
 for i in $(find "${modules}" -mindepth 1 -maxdepth 1 -type d | sort -n ); do