From 180c4c5a4b3fec25199186a1223ef06dc4f22fd3 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 9 May 2021 13:18:58 +0200
Subject: [PATCH] fixes

---
 modules/40-basesystem/install | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/40-basesystem/install b/modules/40-basesystem/install
index 2f0d6e3..17793a7 100644
--- a/modules/40-basesystem/install
+++ b/modules/40-basesystem/install
@@ -102,6 +102,7 @@ sed -i "/FONT=/s/^#//g" /etc/rc.conf
 echo '0 * * * * /usr/bin/void-snapshot cron #void.system' > /var/spool/cron/root
 
 if [[ ! ${cfg[fde_key_store]} == "none" ]]; then
+	echo "Install pw is 'oem'"
 	echo "read -p \"Change PW for disk? y/n \" answer" > /etc/runit/core-services/99-changepwdisk.sh
 	echo "if [ \"\${answer}\" = \"y\" ]; then" >> /etc/runit/core-services/99-changepwdisk.sh
 	echo "	while ! cryptsetup luksChangeKey /dev/disk/by-uuid/${cfg[partuuid]}; do" >> /etc/runit/core-services/99-changepwdisk.sh
@@ -109,14 +110,15 @@ if [[ ! ${cfg[fde_key_store]} == "none" ]]; then
 	echo "	done" >> /etc/runit/core-services/99-changepwdisk.sh
 	echo "	rm -rf /etc/runit/core-services/99-changepwdisk.sh" >> /etc/runit/core-services/99-changepwdisk.sh
 	echo "fi" >> /etc/runit/core-services/99-changepwdisk.sh
-	
-	echo "read -p \"Change PW for ${users[name1]}? y/n \" answer" > /etc/runit/core-services/99-changepwuser.sh
-	echo "if [ \"\${answer}\" = \"y\" ]; then" >> /etc/runit/core-services/99-changepwuser.sh
-	echo "	while ! passwd ${users[name1]}; do" >> /etc/runit/core-services/99-changepwuser.sh
-	echo "		echo \"Again, please\"" >> /etc/runit/core-services/99-changepwuser.sh
-	echo "	done" >> /etc/runit/core-services/99-changepwuser.sh
-	echo "	rm -rf /etc/runit/core-services/99-changepwuser.sh" >> /etc/runit/core-services/99-changepwuser.sh
-	echo "fi" >> /etc/runit/core-services/99-changepwuser.sh
-fi
+fi	
+
+echo "Install pw is 'oem'"
+echo "read -p \"Change PW for ${users[name1]}? y/n \" answer" > /etc/runit/core-services/99-changepwuser.sh
+echo "if [ \"\${answer}\" = \"y\" ]; then" >> /etc/runit/core-services/99-changepwuser.sh
+echo "	while ! passwd ${users[name1]}; do" >> /etc/runit/core-services/99-changepwuser.sh
+echo "		echo \"Again, please\"" >> /etc/runit/core-services/99-changepwuser.sh
+echo "	done" >> /etc/runit/core-services/99-changepwuser.sh
+echo "	rm -rf /etc/runit/core-services/99-changepwuser.sh" >> /etc/runit/core-services/99-changepwuser.sh
+echo "fi" >> /etc/runit/core-services/99-changepwuser.sh
 
 module end