| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | examples/guided.py | 8 | ||||
| -rw-r--r-- | examples/only_hd.py | 2 | ||||
| -rw-r--r-- | examples/swiss.py | 6 |
diff --git a/examples/guided.py b/examples/guided.py index a23c0011..f0b52299 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -54,12 +54,8 @@ def ask_user_questions(): global_menu.enable('disk_layouts') - # Get disk encryption password (or skip if blank) - global_menu.enable('!encryption-password') - - if archinstall.arguments.get('advanced', False) or archinstall.arguments.get('HSM', None): - # Enables the use of HSM - global_menu.enable('HSM') + # Specify disk encryption options + global_menu.enable('disk_encryption') # Ask which boot-loader to use (will only ask if we're in UEFI mode, otherwise will default to GRUB) global_menu.enable('bootloader') diff --git a/examples/only_hd.py b/examples/only_hd.py index b3379601..e3d18f0a 100644 --- a/examples/only_hd.py +++ b/examples/only_hd.py @@ -12,7 +12,7 @@ class OnlyHDMenu(archinstall.GlobalMenu): super()._setup_selection_menu_options() options_list = [] mandatory_list = [] - options_list = ['harddrives', 'disk_layouts', '!encryption-password','swap'] + options_list = ['harddrives', 'disk_layouts', 'disk_encryption','swap'] mandatory_list = ['harddrives'] options_list.extend(['save_config','install','abort']) diff --git a/examples/swiss.py b/examples/swiss.py index 419bd859..442281de 100644 --- a/examples/swiss.py +++ b/examples/swiss.py @@ -153,7 +153,7 @@ def select_installed_locale(mode): _menus """ -class SetupMenu(archinstall.GeneralMenu): +class SetupMenu(archinstall.AbstractMenu): def __init__(self,storage_area): super().__init__(data_store=storage_area) @@ -230,14 +230,14 @@ class MyMenu(archinstall.GlobalMenu): mandatory_list = [] if self._execution_mode in ('full','lineal'): options_list = ['keyboard-layout', 'mirror-region', 'harddrives', 'disk_layouts', - '!encryption-password','swap', 'bootloader', 'hostname', '!root-password', + 'disk_encryption','swap', 'bootloader', 'hostname', '!root-password', '!users', 'profile', 'audio', 'kernels', 'packages','additional-repositories','nic', 'timezone', 'ntp'] if archinstall.arguments.get('advanced',False): options_list.extend(['sys-language','sys-encoding']) mandatory_list = ['harddrives','bootloader','hostname'] elif self._execution_mode == 'only_hd': - options_list = ['harddrives', 'disk_layouts', '!encryption-password','swap'] + options_list = ['harddrives', 'disk_layouts', 'disk_encryption','swap'] mandatory_list = ['harddrives'] elif self._execution_mode == 'only_os': options_list = ['keyboard-layout', 'mirror-region','bootloader', 'hostname', |