Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorDylan M. Taylor <dylan@dylanmtaylor.com>2022-05-29 03:25:22 -0400
committerGitHub <noreply@github.com>2022-05-29 09:25:22 +0200
commitb2f85889a7a935a4d9638fe0fec5aac45e721b09 (patch)
tree506b63861c17b3bc70a6c4c48d2791c81733e210 /archinstall
parent121e077b4eff56196e12511e12866ac94f944e46 (diff)
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
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/menu/global_menu.py5
-rw-r--r--archinstall/lib/user_interaction/partitioning_conf.py2
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()