Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-04-27 10:43:35 +0000
committerGitHub <noreply@github.com>2021-04-27 10:43:35 +0000
commit831f5e4eaf66f6f1a2aed04932af064ce9314dd4 (patch)
tree9eea4eee861f252a154a95f4579d604021bfcaae /archinstall
parent1f6094ea594785cae105d34b8c0e4bbc6fb71927 (diff)
parent2762144e32413ee8d6df433d31bc7b096d11e700 (diff)
Merge pull request #315 from AggamR/master
selecting a kernel
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/installer.py5
-rw-r--r--archinstall/lib/user_interaction.py2
2 files changed, 5 insertions, 2 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index f6c891a3..e2762603 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -39,7 +39,8 @@ class Installer():
:type hostname: str, optional
"""
- def __init__(self, target, *, base_packages='base base-devel linux linux-firmware'):
+ def __init__(self, target, *, base_packages='base base-devel linux linux-firmware', kernels='linux'):
+ base_packages = base_packages + kernels.replace(',', ' ')
self.target = target
self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
self.milliseconds = int(str(time.time()).split('.')[1])
@@ -342,7 +343,7 @@ class Installer():
mkinit.write(f"BINARIES=({' '.join(BINARIES)})\n")
mkinit.write(f"FILES=({' '.join(FILES)})\n")
mkinit.write(f"HOOKS=({' '.join(HOOKS)})\n")
- sys_command(f'/usr/bin/arch-chroot {self.target} mkinitcpio -p linux')
+ sys_command(f'/usr/bin/arch-chroot {self.target} mkinitcpio -P')
self.helper_flags['base'] = True
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 70ff7a1e..e38f5311 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -230,6 +230,8 @@ def generic_select(options, input_text="Select one of the above by index or abso
1: first
2: second
3: third option
+
+ it will return the selected text.
"""
if type(options) == dict: options = list(options)