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

Solve issue #894 (#898) 

some references to archinstall.storage turned to archinstall.arguments
This commit is contained in:
Werner Llácer 2022-01-24 10:33:46 +01:00 committed by GitHub
parent 34488d25c5
commit bb98594054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall/lib/menu/selection_menu.py
View File

@ -234,7 +234,6 @@ class GlobalMenu:
exit(0) exit(0)
elif 'Install' in selection: elif 'Install' in selection:
if self._missing_configs() == 0: if self._missing_configs() == 0:
self._post_processing()
break break
else: else:
self._process_selection(selection) self._process_selection(selection)
@ -242,7 +241,8 @@ class GlobalMenu:
sel = self._menu_options[key] sel = self._menu_options[key]
if key not in archinstall.arguments: if key not in archinstall.arguments:
archinstall.arguments[key] = sel._current_selection archinstall.arguments[key] = sel._current_selection
self._post_processing()
exit()
def _process_selection(self, selection): def _process_selection(self, selection):
# find the selected option in our option list # find the selected option in our option list
option = [[k, v] for k, v in self._menu_options.items() if v.text.strip() == selection] 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 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.. # 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). # 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: if len(list(archinstall.encrypted_partitions(archinstall.arguments['disk_layouts']))) == 0:
archinstall.storage['disk_layouts'] = archinstall.select_encrypted_partitions( archinstall.arguments['disk_layouts'] = archinstall.select_encrypted_partitions(
archinstall.storage['disk_layouts'], archinstall.arguments['!encryption-password']) archinstall.arguments['disk_layouts'], archinstall.arguments['!encryption-password'])
def _install_text(self): def _install_text(self):
missing = self._missing_configs() missing = self._missing_configs()