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

Remove HSM from global menu (#1559) 

* Remove HSM from global menu

* Update

* Update

* Removed sys import

Unused import

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
Co-authored-by: Anton Hvornum <anton.feeds+github@gmail.com>
This commit is contained in:
Daniel Girtler 2022-11-13 23:56:21 +11:00 committed by GitHub
parent c3862c5779
commit e05df22986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/menu/abstract_menu.py
View File

@ -1,7 +1,6 @@
from __future__ import annotations from __future__ import annotations
import logging import logging
import sys
from typing import Callable, Any, List, Iterator, Tuple, Optional, Dict, TYPE_CHECKING from typing import Callable, Any, List, Iterator, Tuple, Optional, Dict, TYPE_CHECKING
from .menu import Menu, MenuSelectionType from .menu import Menu, MenuSelectionType
@ -261,8 +260,7 @@ class AbstractMenu:
self._menu_options[selector_name].set_mandatory(True) self._menu_options[selector_name].set_mandatory(True)
self.synch(selector_name,omit_if_set) self.synch(selector_name,omit_if_set)
else: else:
print(f'No selector found: {selector_name}') raise ValueError(f'No selector found: {selector_name}')
sys.exit(1)
def _preview_display(self, selection_name: str) -> Optional[str]: def _preview_display(self, selection_name: str) -> Optional[str]:
config_name, selector = self._find_selection(selection_name) config_name, selector = self._find_selection(selection_name)

4
examples/guided.py
View File

@ -57,10 +57,6 @@ def ask_user_questions():
# Specify disk encryption options # Specify disk encryption options
global_menu.enable('disk_encryption') global_menu.enable('disk_encryption')
if archinstall.arguments.get('advanced', False) or archinstall.arguments.get('HSM', None):
# Enables the use of HSM
global_menu.enable('HSM')
# Ask which boot-loader to use (will only ask if we're in UEFI mode, otherwise will default to GRUB) # Ask which boot-loader to use (will only ask if we're in UEFI mode, otherwise will default to GRUB)
global_menu.enable('bootloader') global_menu.enable('bootloader')