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

---
 modules/40-basesystem/install | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/modules/40-basesystem/install b/modules/40-basesystem/install
index 9adfdbb..2ce861a 100644
--- a/modules/40-basesystem/install
+++ b/modules/40-basesystem/install
@@ -65,25 +65,21 @@ sed -i "/HARDWARECLOCK/s/^#//g" "${dest}/etc/rc.conf"
 sed -i "/FONT=/s/^#//g" "${dest}/etc/rc.conf"
 
 if [[ ! ${cfg[fde_key_store]} == "none" ]]; then
-	if [[ "${cfg[diskpw]}" == "oem" ]]; then
-		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
-		echo "		echo \"Again, please\"" >> /etc/runit/core-services/99-changepwdisk.sh
-		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
-	fi
+	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
+	echo "		echo \"Again, please\"" >> /etc/runit/core-services/99-changepwdisk.sh
+	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
 	
-	if [[ "${users[pw1]}" == "oem" ]]; then
-		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
+	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
 
 echo "transaction_log                 /var/log/btrbk.log" > /etc/btrbk/btrbk.conf