Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Llácer <wllacer@gmail.com>2022-01-24 10:33:46 +0100
committerGitHub <noreply@github.com>2022-01-24 10:33:46 +0100
commitbb98594054939e469d07f704e70f597a8b379657 (patch)
treed71f1c61d664e3ccc4dc01a40ac253ca0515e5db
parent34488d25c57d39745ab5127ab992adcdb1b97d80 (diff)
Solve issue #894 (#898)
some references to archinstall.storage turned to archinstall.arguments
-rw-r--r--archinstall/lib/menu/selection_menu.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/archinstall/lib/menu/selection_menu.py b/archinstall/lib/menu/selection_menu.py
index fe9b4160..648fed94 100644
--- a/archinstall/lib/menu/selection_menu.py
+++ b/archinstall/lib/menu/selection_menu.py
@@ -234,7 +234,6 @@ class GlobalMenu:
exit(0)
elif 'Install' in selection:
if self._missing_configs() == 0:
- self._post_processing()
break
else:
self._process_selection(selection)
@@ -242,7 +241,8 @@ class GlobalMenu:
sel = self._menu_options[key]
if key not in archinstall.arguments:
archinstall.arguments[key] = sel._current_selection
-
+ self._post_processing()
+ exit()
def _process_selection(self, selection):
# find the selected option in our option list
option = [[k, v] for k, v in self._menu_options.items() if v.text.strip() == selection]
@@ -266,9 +266,9 @@ class GlobalMenu:
if archinstall.arguments.get('harddrives', None) and archinstall.arguments.get('!encryption-password', None):
# If no partitions was marked as encrypted, but a password was supplied and we have some disks to format..
# Then we need to identify which partitions to encrypt. This will default to / (root).
- if len(list(archinstall.encrypted_partitions(archinstall.storage['disk_layouts']))) == 0:
- archinstall.storage['disk_layouts'] = archinstall.select_encrypted_partitions(
- archinstall.storage['disk_layouts'], archinstall.arguments['!encryption-password'])
+ if len(list(archinstall.encrypted_partitions(archinstall.arguments['disk_layouts']))) == 0:
+ archinstall.arguments['disk_layouts'] = archinstall.select_encrypted_partitions(
+ archinstall.arguments['disk_layouts'], archinstall.arguments['!encryption-password'])
def _install_text(self):
missing = self._missing_configs()