Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Girtler <blackrabbit256@gmail.com>2022-11-13 23:56:21 +1100
committerGitHub <noreply@github.com>2022-11-13 13:56:21 +0100
commite05df22986d2adbe9041be91884f8bb577a330a1 (patch)
tree4fee66fe556517f9b5202cc4f16302abca7b7045
parentc3862c5779194f5e93f9fd2518bb15706c93ad2b (diff)
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>
-rw-r--r--archinstall/lib/menu/abstract_menu.py4
-rw-r--r--examples/guided.py4
2 files changed, 1 insertions, 7 deletions
diff --git a/archinstall/lib/menu/abstract_menu.py b/archinstall/lib/menu/abstract_menu.py
index 61466e3e..5a7ca03a 100644
--- a/archinstall/lib/menu/abstract_menu.py
+++ b/archinstall/lib/menu/abstract_menu.py
@@ -1,7 +1,6 @@
from __future__ import annotations
import logging
-import sys
from typing import Callable, Any, List, Iterator, Tuple, Optional, Dict, TYPE_CHECKING
from .menu import Menu, MenuSelectionType
@@ -261,8 +260,7 @@ class AbstractMenu:
self._menu_options[selector_name].set_mandatory(True)
self.synch(selector_name,omit_if_set)
else:
- print(f'No selector found: {selector_name}')
- sys.exit(1)
+ raise ValueError(f'No selector found: {selector_name}')
def _preview_display(self, selection_name: str) -> Optional[str]:
config_name, selector = self._find_selection(selection_name)
diff --git a/examples/guided.py b/examples/guided.py
index 4b655240..e242138e 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -57,10 +57,6 @@ def ask_user_questions():
# Specify disk encryption options
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)
global_menu.enable('bootloader')