Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/disk
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2022-05-28 10:06:22 +0200
committerGitHub <noreply@github.com>2022-05-28 10:06:22 +0200
commit5c9bd235d3d0e653ba8d643748fd3d776359978b (patch)
tree049a17985d8329967afa6f8e01d4a09abf631bc9 /archinstall/lib/disk
parent78449f75bc44f0e2b03cb9d909b9b78e4f7ca4c8 (diff)
Fixes additional encryption prompt even tho partitions was marked for encryption (#1264)
Corrected the check for partitions marked with `encrypt: true`
Diffstat (limited to 'archinstall/lib/disk')
-rw-r--r--archinstall/lib/disk/helpers.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/archinstall/lib/disk/helpers.py b/archinstall/lib/disk/helpers.py
index 99856aad..65d7a006 100644
--- a/archinstall/lib/disk/helpers.py
+++ b/archinstall/lib/disk/helpers.py
@@ -433,9 +433,10 @@ def disk_layouts() -> Optional[Dict[str, Any]]:
def encrypted_partitions(blockdevices :Dict[str, Any]) -> bool:
- for partition in blockdevices.values():
- if partition.get('encrypted', False):
- yield partition
+ for blockdevice in blockdevices.values():
+ for partition in blockdevice.get('partitions', []):
+ if partition.get('encrypted', False):
+ yield partition
def find_partition_by_mountpoint(block_devices :List[BlockDevice], relative_mountpoint :str) -> Partition:
for device in block_devices: