From c3862c5779194f5e93f9fd2518bb15706c93ad2b Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Fri, 11 Nov 2022 19:40:05 +1100 Subject: New encryption menu (#1520) * New encryption menu Co-authored-by: Daniel Girtler Co-authored-by: Anton Hvornum --- examples/guided.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/guided.py') diff --git a/examples/guided.py b/examples/guided.py index eba78a1a..4b655240 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -54,8 +54,8 @@ def ask_user_questions(): global_menu.enable('disk_layouts') - # Get disk encryption password (or skip if blank) - global_menu.enable('!encryption-password') + # 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 -- cgit v1.2.3-54-g00ecf From e05df22986d2adbe9041be91884f8bb577a330a1 Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Sun, 13 Nov 2022 23:56:21 +1100 Subject: Remove HSM from global menu (#1559) * Remove HSM from global menu * Update * Update * Removed sys import Unused import Co-authored-by: Daniel Girtler Co-authored-by: Anton Hvornum --- archinstall/lib/menu/abstract_menu.py | 4 +--- examples/guided.py | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'examples/guided.py') 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') -- cgit v1.2.3-54-g00ecf