Changes to take correctly the 'kernels' argument (cf. isssue 868) (#869)
This commit is contained in:
parent
b533bd0553
commit
6b4f09ef01
|
|
@ -89,9 +89,11 @@ class Installer:
|
||||||
if base_packages is None:
|
if base_packages is None:
|
||||||
base_packages = __packages__[:3]
|
base_packages = __packages__[:3]
|
||||||
if kernels is None:
|
if kernels is None:
|
||||||
kernels = ['linux']
|
self.kernels = ['linux']
|
||||||
|
elif isinstance(kernels,str):
|
||||||
self.kernels = kernels
|
self.kernels = [kernels]
|
||||||
|
else:
|
||||||
|
self.kernels = kernels
|
||||||
self.target = target
|
self.target = target
|
||||||
self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
|
self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
|
||||||
self.milliseconds = int(str(time.time()).split('.')[1])
|
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
|
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)
|
self.base_packages.append(kernel)
|
||||||
|
|
||||||
# If using accessibility tools in the live environment, append those to the packages list
|
# If using accessibility tools in the live environment, append those to the packages list
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,7 @@ class GlobalMenu:
|
||||||
Selector(
|
Selector(
|
||||||
'Select kernels',
|
'Select kernels',
|
||||||
lambda: archinstall.select_kernel(),
|
lambda: archinstall.select_kernel(),
|
||||||
default='linux')
|
default=['linux'])
|
||||||
self._menu_options['packages'] = \
|
self._menu_options['packages'] = \
|
||||||
Selector(
|
Selector(
|
||||||
'Additional packages to install',
|
'Additional packages to install',
|
||||||
|
|
|
||||||
|
|
@ -910,7 +910,6 @@ def select_kernel() -> List[str]:
|
||||||
multi=True,
|
multi=True,
|
||||||
default_option=default_kernel
|
default_option=default_kernel
|
||||||
).run()
|
).run()
|
||||||
|
|
||||||
return selected_kernels
|
return selected_kernels
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue