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

Missing arguments after GlobalMenu execution (issue #868) (#871) 

* Install.__init__ parameter kernel as a list everywhere.
I've dropped the string check, as it shouldn't happen again, and it's good that it fails, when it happens

* Global Menu now loads in the arguments dict all options enabled with default value and no manually selected (issue #868)
This commit is contained in:
Werner Llácer 2022-01-15 21:44:13 +01:00 committed by GitHub
parent 31f55e8d6b
commit 3d30a4eb28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archinstall/lib/installer.py
View File

@ -90,8 +90,6 @@ class Installer:
base_packages = __packages__[:3] base_packages = __packages__[:3]
if kernels is None: if kernels is None:
self.kernels = ['linux'] self.kernels = ['linux']
elif isinstance(kernels,str):
self.kernels = [kernels]
else: else:
self.kernels = kernels self.kernels = kernels
self.target = target self.target = target

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

@ -238,6 +238,10 @@ class GlobalMenu:
break break
else: else:
self._process_selection(selection) self._process_selection(selection)
for key in self._menu_options:
sel = self._menu_options[key]
if sel.enabled and sel.has_selection() and key not in archinstall.arguments:
archinstall.arguments[key] = sel._current_selection
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

8
examples/guided.py
View File

@ -138,7 +138,7 @@ def save_user_configurations():
with open("/var/log/archinstall/user_configuration.json", "w") as config_file: with open("/var/log/archinstall/user_configuration.json", "w") as config_file:
config_file.write(user_configuration) config_file.write(user_configuration)
if archinstall.arguments.get('disk_layouts'): if archinstall.arguments.get('disk_layouts'):
user_disk_layout = json.dumps(archinstall.arguments['disk_layouts'], indent=4, sort_keys=True, cls=archinstall.JSON) user_disk_layout = json.dumps(archinstall.arguments['disk_layouts'], indent=4, sort_keys=True, cls=archinstall.JSON)
with open("/var/log/archinstall/user_disk_layout.json", "w") as disk_layout_file: with open("/var/log/archinstall/user_disk_layout.json", "w") as disk_layout_file:
@ -148,10 +148,10 @@ def perform_filesystem_operations():
print() print()
print('This is your chosen configuration:') print('This is your chosen configuration:')
archinstall.log("-- Guided template chosen (with below config) --", level=logging.DEBUG) archinstall.log("-- Guided template chosen (with below config) --", level=logging.DEBUG)
user_configuration = json.dumps({**archinstall.arguments, 'version' : archinstall.__version__} , indent=4, sort_keys=True, cls=archinstall.JSON) user_configuration = json.dumps({**archinstall.arguments, 'version' : archinstall.__version__} , indent=4, sort_keys=True, cls=archinstall.JSON)
archinstall.log(user_configuration, level=logging.INFO) archinstall.log(user_configuration, level=logging.INFO)
if archinstall.arguments.get('disk_layouts'): if archinstall.arguments.get('disk_layouts'):
user_disk_layout = json.dumps(archinstall.arguments['disk_layouts'], indent=4, sort_keys=True, cls=archinstall.JSON) user_disk_layout = json.dumps(archinstall.arguments['disk_layouts'], indent=4, sort_keys=True, cls=archinstall.JSON)
archinstall.log(user_disk_layout, level=logging.INFO) archinstall.log(user_disk_layout, level=logging.INFO)
@ -192,7 +192,7 @@ def perform_installation(mountpoint):
Only requirement is that the block devices are Only requirement is that the block devices are
formatted and setup prior to entering this function. formatted and setup prior to entering this function.
""" """
with archinstall.Installer(mountpoint, kernels=archinstall.arguments.get('kernels', 'linux')) as installation: with archinstall.Installer(mountpoint, kernels=archinstall.arguments.get('kernels', ['linux'])) as installation:
# Mount all the drives to the desired mountpoint # Mount all the drives to the desired mountpoint
# This *can* be done outside of the installation, but the installer can deal with it. # This *can* be done outside of the installation, but the installer can deal with it.
if archinstall.arguments.get('disk_layouts'): if archinstall.arguments.get('disk_layouts'):

2
examples/only_hd.py
View File

@ -174,7 +174,7 @@ def perform_installation(mountpoint):
Only requirement is that the block devices are Only requirement is that the block devices are
formatted and setup prior to entering this function. formatted and setup prior to entering this function.
""" """
with archinstall.Installer(mountpoint, kernels=archinstall.arguments.get('kernels', 'linux')) as installation: with archinstall.Installer(mountpoint, kernels=None) as installation:
# Mount all the drives to the desired mountpoint # Mount all the drives to the desired mountpoint
# This *can* be done outside of the installation, but the installer can deal with it. # This *can* be done outside of the installation, but the installer can deal with it.
if archinstall.storage.get('disk_layouts'): if archinstall.storage.get('disk_layouts'):