Implemented #106 in branch skip-partitioning. Also moving the disk_password from being a local variable to a BlockDevice setting/variable.

3 files changed, 17 insertions, 8 deletions

diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index aa3632d8..d76c6d7e 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -23,6 +23,10 @@ class BlockDevice():
 		self.path = path
 		self.info = info
 		self.part_cache = OrderedDict()
+		# TODO: Currently disk encryption is a BIT missleading.
+		#       It's actually partition-encryption, but for future-proofing this
+		#       I'm placing the encryption password on a BlockDevice level.
+		self.encryption_passwoed = None
 
 	def __repr__(self, *args, **kwargs):
 		return f"BlockDevice({self.device})"
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index fdbabe96..f92cd008 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -1,10 +1,20 @@
+import getpass
 from .exceptions import *
 from .profiles import Profile
 from .locale_helpers import search_keyboard_layout
+from .output import log
 
 ## TODO: Some inconsistencies between the selection processes.
 ##       Some return the keys from the options, some the values?
 
+def get_password(prompt="Enter a password: "):
+	while (passwd := getpass.getpass(prompt)):
+		passwd_verification = getpass.getpass(prompt='And one more time for verification: ')
+		if passwd != passwd_verification:
+			log(' * Passwords did not match * ', bg='black', fg='red')
+			continue
+		return passwd
+
 def generic_select(options, input_text="Select one of the above by index or absolute value: ", sort=True):
 	"""
 	A generic select function that does not output anything
diff --git a/examples/guided.py b/examples/guided.py
index 0efc438c..84676284 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -152,16 +152,11 @@ if archinstall.arguments['harddrive'].has_partitions():
 	else:
 		archinstall.arguments['harddrive'].keep_partitions = False
 
-exit(0)
-while (disk_password := getpass.getpass(prompt='Enter disk encryption password (leave blank for no encryption): ')):
-	disk_password_verification = getpass.getpass(prompt='And one more time for verification: ')
-	if disk_password != disk_password_verification:
-		archinstall.log(' * Passwords did not match * ', bg='black', fg='red')
-		continue
-	archinstall.storage['_guided']['disk_encryption'] = True
-	break
 
+disk_password = archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): ')
+archinstall.arguments['harddrive'].encryption_passwoed = disk_password
 
+exit(0)
 # Ask for a hostname
 hostname = input('Desired hostname for the installation: ')
 if len(hostname) == 0: