From b2f85889a7a935a4d9638fe0fec5aac45e721b09 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 29 May 2022 03:25:22 -0400 Subject: Don't offer to encrypt /boot, exlude it from the set available to the user (#1273) * WIP: Don't offer to encrypt /boot * This filter might work * Ref: https://github.com/archlinux/archinstall/blob/master/archinstall/lib/storage.py * Use list comprehension * I wonder if I can use this filter_ argument that exists already * flake8 fix * Show index --- archinstall/lib/menu/global_menu.py | 5 +++-- archinstall/lib/user_interaction/partitioning_conf.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/archinstall/lib/menu/global_menu.py b/archinstall/lib/menu/global_menu.py index 3ffb6f15..a758d8c6 100644 --- a/archinstall/lib/menu/global_menu.py +++ b/archinstall/lib/menu/global_menu.py @@ -206,8 +206,9 @@ class GlobalMenu(GeneralMenu): for blockdevice in storage['arguments']['disk_layouts']: if storage['arguments']['disk_layouts'][blockdevice].get('partitions'): for partition_index in select_encrypted_partitions( - title="Select which partitions to encrypt:", - partitions=storage['arguments']['disk_layouts'][blockdevice]['partitions'] + title=_('Select which partitions to encrypt:'), + partitions=storage['arguments']['disk_layouts'][blockdevice]['partitions'], + filter_=(lambda p: p['mountpoint'] != '/boot') ): partition = storage['arguments']['disk_layouts'][blockdevice]['partitions'][partition_index] diff --git a/archinstall/lib/user_interaction/partitioning_conf.py b/archinstall/lib/user_interaction/partitioning_conf.py index 1f41f9b0..1ecba8be 100644 --- a/archinstall/lib/user_interaction/partitioning_conf.py +++ b/archinstall/lib/user_interaction/partitioning_conf.py @@ -376,7 +376,7 @@ def select_encrypted_partitions( # show current partition layout: if len(partitions): - title += current_partition_layout(partitions) + '\n' + title += current_partition_layout(partitions, with_idx=True) + '\n' choice = Menu(title, partition_indexes, multi=multiple).run() -- cgit v1.2.3-70-g09d2