From 96dddf9d43d5b869d120ac6edbbacc87e0a6cc94 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 9 Feb 2022 12:20:53 +0100
Subject: [PATCH] progress

---
 main.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/main.sh b/main.sh
index 42f6480..f529c70 100755
--- a/main.sh
+++ b/main.sh
@@ -5,7 +5,7 @@ TIMEZONE="Europe/Berlin"
 
 
 main="/tmp/vinstall"
-target="${main}/target"
+target="/mnt"
 tmp_target="${main}/tmp_target"
 vars="${target}/tmp/vinstaller/vars"
 files="./files"
@@ -14,6 +14,7 @@ umount -R ${target}/boot/efi ${target}/boot ${target}/tmp/vinstaller/ ${target}/
 vgchange -an
 cryptsetup close /dev/mapper/luks*
 rm -rf $main
+DEBUG=${DEBUG:=0}
 
 if [ "${DEBUG}" == "2" ]; then
 	set -x
@@ -270,6 +271,7 @@ echo_vars() {
 		echo "LANGUAGE_=${LANGUAGE_}"
 		echo "L1=${L1}"
 		echo "L2=${L2}"
+		echo "KEY_LANG=${KEY_LANG}"
 		echo "TARGET_PHY_ID=${TARGET_PHY_ID}"
 		echo "TARGET_PART=${TARGET_PART}"
 		echo "TARGETNAME_UNDERSCORE=${TARGETNAME_UNDERSCORE}"
@@ -277,7 +279,7 @@ echo_vars() {
 		echo "TIMEZONE=${TIMEZONE}"
 		echo "ENC=${ENC}"
 		echo "HIBERNATE=${HIBERNATE}"
-		echo "KEY_LANG=${KEY_LANG}"
+		echo "DEBUG=${DEBUG}"
 	fi
 }
 
@@ -303,6 +305,7 @@ do_chroot() {
 	echo "LANGUAGE_=${LANGUAGE_}" >> "${vars}"
 	echo "L1=${L1}" >> "${vars}"
 	echo "L2=${L2}" >> "${vars}"
+	echo "KEY_LANG=${KEY_LANG}" >> "${vars}"
 	echo "TARGET_PHY_ID=${TARGET_PHY_ID}" >> "${vars}"
 	echo "TARGET_PART=${TARGET_PART}" >> "${vars}"
 	echo "TARGETNAME_UNDERSCORE=${TARGETNAME_UNDERSCORE}" >> "${vars}"
@@ -310,7 +313,7 @@ do_chroot() {
 	echo "TIMEZONE=${TIMEZONE}" >> "${vars}"
 	echo "ENC=${ENC}" >> "${vars}"
 	echo "HIBERNATE=${HIBERNATE}" >> "${vars}"
-	echo "KEY_LANG=${KEY_LANG}" >> "${vars}"
+	echo "DEBUG=${DEBUG}" >> "${vars}"
 
 cat <<EOF > "${target}/tmp/vinstaller/main_chroot"
 #!/usr/bin/bash