Renamed keyboard-language to keyboard-layout to avoid confusion. Added encryption checks for disk layout selection, if disk encryption password is given - but no partitions were found using encryption, the user will be asked which partitions to encrypt - unless there's only /boot and /<root> then we'll automatically select /<root> because that's what we support for now.

1 files changed, 11 insertions, 1 deletions

diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index 30b66835..3241c455 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -730,4 +730,14 @@ def disk_layouts():
 		return json.loads(b''.join(handle).decode('UTF-8'))
 	except SysCallError as err:
 		log(f"Could not return disk layouts: {err}")
-		return None
\ No newline at end of file
+		return None
+
+def encrypted_partitions(blockdevices :dict) -> bool:
+	for partition in blockdevices.values():
+		if partition.get('encrypted', False):
+			yield partition
+
+def find_partition_by_mountpoint(partitions, relative_mountpoint :str):
+	for partition in partitions:
+		if partition.get('mountpoint', None) == relative_mountpoint:
+			return partition
\ No newline at end of file