RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dylan M. Taylor 2022-05-29 03:25:22 -04:00 committed by GitHub
parent 121e077b4e
commit b2f85889a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archinstall/lib/menu/global_menu.py
View File

@ -206,8 +206,9 @@ class GlobalMenu(GeneralMenu):
for blockdevice in storage['arguments']['disk_layouts']: for blockdevice in storage['arguments']['disk_layouts']:
if storage['arguments']['disk_layouts'][blockdevice].get('partitions'): if storage['arguments']['disk_layouts'][blockdevice].get('partitions'):
for partition_index in select_encrypted_partitions( for partition_index in select_encrypted_partitions(
title="Select which partitions to encrypt:", title=_('Select which partitions to encrypt:'),
partitions=storage['arguments']['disk_layouts'][blockdevice]['partitions'] partitions=storage['arguments']['disk_layouts'][blockdevice]['partitions'],
filter_=(lambda p: p['mountpoint'] != '/boot')
): ):
partition = storage['arguments']['disk_layouts'][blockdevice]['partitions'][partition_index] partition = storage['arguments']['disk_layouts'][blockdevice]['partitions'][partition_index]

2
archinstall/lib/user_interaction/partitioning_conf.py
View File

@ -376,7 +376,7 @@ def select_encrypted_partitions(
# show current partition layout: # show current partition layout:
if len(partitions): 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() choice = Menu(title, partition_indexes, multi=multiple).run()