progress

main.sh

@@ -53,6 +53,7 @@ use_efi() {
 }
 
 encryption_style() {
+	ENC=1
 	header "Choose encryption style"
 	echo "a)keyfile in initramfs"						#bios: 1 uefi: 2
 	echo "b)no encryption"								#bios: 2 uefi: 2
@@ -62,6 +63,9 @@ encryption_style() {
 	#echo "e)unencrypted boot"							#bios: 2 uefi: 2
 	multiplechoice "a" "b" "c" "d" "e"
 	ENCRYPTION_STYLE="$output"
+	if [ "$ENCRYPTION_STYLE" == "b" ]; then
+		ENC=0
+	fi
 }
 
 hibernation() {
@@ -345,6 +349,8 @@ do_chroot() {
 	echo "TARGETNAME_UNDERSCORE=$TARGETNAME_UNDERSCORE" >> ${target}/tmp/vinstaller/vars
 	echo "ENCRYPTION_STYLE=$ENCRYPTION_STYLE" >> ${target}/tmp/vinstaller/vars
 	echo "timezone=$timezone" >> ${target}/tmp/vinstaller/vars
+	echo "ENC=$ENC" >> ${target}/tmp/vinstaller/vars
+	echo "HIBERNATE=$HIBERNATE" >> ${target}/tmp/vinstaller/vars
 
 cat <<EOF > ${target}/tmp/vinstaller/main_chroot
 #!/bin/bash
@@ -363,15 +369,13 @@ chroot ${target} /tmp/vinstaller/main_chroot
 }
 
 ready() {
-	echo "\n\n"
+	echo ""; echo ""
 	echo "#################"
 	echo ""
-	echo "login with ${USERNAME}:${pass}"
+	echo "login: ${USERNAME}:${pass}"
 	echo "hostname: $HOSTNAME"
-	echo ""
-	echo bibernation tbd
-	echo encryption tbd
-	#if hib/enc 1, then echo hibernation on/off resp. enc on/off
+	echo "encryption: $ENC"
+	echo "hibernation: $HIBERNATION"
 }