Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-04-27 13:33:52 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2021-04-27 13:33:52 +0200
commit5852582bbf3e754c957fb839dc8a9b0f6ed70a47 (patch)
treec82e22700860df597721dc40c22c95656afe1d3f /archinstall/lib
parent85e4a85cdb1cebbf4fb8c9ad59c7531e6be06ed5 (diff)
parent831f5e4eaf66f6f1a2aed04932af064ce9314dd4 (diff)
Pulled in latest changes from torxed-v2.2.0
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/installer.py5
-rw-r--r--archinstall/lib/user_interaction.py8
2 files changed, 11 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 bd9d432d..91ed5ed9 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -259,12 +259,20 @@ def generic_select(options, input_text="Select one of the above by index or abso
other than the options and their indexes. As an example:
generic_select(["first", "second", "third option"])
+<<<<<<< HEAD
0: first
1: second
2: third option
When the user has entered the option correctly,
this function returns an item from list, a string, or None
+=======
+ 1: first
+ 2: second
+ 3: third option
+
+ it will return the selected text.
+>>>>>>> 831f5e4eaf66f6f1a2aed04932af064ce9314dd4
"""
# Checking if options are different from `list` or `dict`