Pulled in latest changes from torxed-v2.2.0

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`