From 6b4f09ef0165629ad63f4d15ec5fde986d2f7417 Mon Sep 17 00:00:00 2001 From: Werner Llácer Date: Sat, 15 Jan 2022 14:17:04 +0100 Subject: Changes to take correctly the 'kernels' argument (cf. isssue 868) (#869) --- archinstall/lib/installer.py | 10 ++++++---- archinstall/lib/menu/selection_menu.py | 2 +- archinstall/lib/user_interaction.py | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'archinstall') diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 6e4a6193..32074e5c 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -89,9 +89,11 @@ class Installer: if base_packages is None: base_packages = __packages__[:3] if kernels is None: - kernels = ['linux'] - - self.kernels = kernels + self.kernels = ['linux'] + elif isinstance(kernels,str): + self.kernels = [kernels] + else: + self.kernels = kernels self.target = target self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S') self.milliseconds = int(str(time.time()).split('.')[1]) @@ -102,7 +104,7 @@ class Installer: } self.base_packages = base_packages.split(' ') if type(base_packages) is str else base_packages - for kernel in kernels: + for kernel in self.kernels: self.base_packages.append(kernel) # If using accessibility tools in the live environment, append those to the packages list diff --git a/archinstall/lib/menu/selection_menu.py b/archinstall/lib/menu/selection_menu.py index 9eb022a6..82e8c47e 100644 --- a/archinstall/lib/menu/selection_menu.py +++ b/archinstall/lib/menu/selection_menu.py @@ -179,7 +179,7 @@ class GlobalMenu: Selector( 'Select kernels', lambda: archinstall.select_kernel(), - default='linux') + default=['linux']) self._menu_options['packages'] = \ Selector( 'Additional packages to install', diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index c213a941..0ce19346 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -910,7 +910,6 @@ def select_kernel() -> List[str]: multi=True, default_option=default_kernel ).run() - return selected_kernels -- cgit v1.2.3-54-g00ecf