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

Fix menu selection (#1173) 

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
This commit is contained in:
Daniel Girtler 2022-05-12 21:04:05 +10:00 committed by GitHub
parent 81b7524b53
commit 53b57a3cec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
archinstall/lib/user_interaction/subvolume_config.py
View File

@ -1,6 +1,7 @@
from typing import Dict from typing import Dict, List
from ..menu.list_manager import ListManager from ..menu.list_manager import ListManager
from ..menu.menu import MenuSelectionType
from ..menu.selection_menu import Selector, GeneralMenu from ..menu.selection_menu import Selector, GeneralMenu
from ..menu.text_input import TextInput from ..menu.text_input import TextInput
from ..menu import Menu from ..menu import Menu
@ -25,6 +26,7 @@ class SubvolumeList(ListManager):
text += _(" mounted at {:16}").format(value['mountpoint']) text += _(" mounted at {:16}").format(value['mountpoint'])
else: else:
text += (' ' * 28) text += (' ' * 28)
if value.get('options',[]): if value.get('options',[]):
text += _(" with option {}").format(', '.join(value['options'])) text += _(" with option {}").format(', '.join(value['options']))
return text return text
@ -126,7 +128,17 @@ class SubvolumeMenu(GeneralMenu):
def _select_subvolume_mount_point(self,value): def _select_subvolume_mount_point(self,value):
return TextInput(str(_("Select a mount point :")),value).run() return TextInput(str(_("Select a mount point :")),value).run()
def _select_subvolume_options(self,value): def _select_subvolume_options(self,value) -> List[str]:
# def __init__(self, title, p_options, skip=True, multi=False, default_option=None, sort=True): # def __init__(self, title, p_options, skip=True, multi=False, default_option=None, sort=True):
return Menu(str(_("Select the desired subvolume options ")),['nodatacow','compress'], choice = Menu(
skip=True,preset_values=value,multi=True).run() str(_("Select the desired subvolume options ")),
['nodatacow','compress'],
skip=True,
preset_values=value,
multi=True
).run()
if choice.type_ == MenuSelectionType.Selection:
return choice.value
return []