From 459f161cf0432393443272ac5b1aa5fc0cd7fd16 Mon Sep 17 00:00:00 2001
From: Aggam Rahamim <agamclass@gmail.com>
Date: Fri, 16 Apr 2021 12:01:20 +0300
Subject: added option to choose kernel

---
 .gitignore                   |  2 +-
 archinstall/lib/installer.py |  3 ++-
 examples/guided.py           | 11 ++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc75bed8..246880ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ SAFETY_LOCK
 **/**.network
 **/**.target
 **/**.qcow2
-**/test.py
+**/test.py
\ No newline at end of file
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 758033a7..d21040fa 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -34,7 +34,8 @@ class Installer():
 	:type hostname: str, optional
 
 	"""
-	def __init__(self, target, *, base_packages='base base-devel linux linux-firmware efibootmgr'):
+	def __init__(self, target, *, base_packages='base base-devel linux-firmware efibootmgr', kernel='linux'):
+		base_packages += ' '+kernel
 		self.target = target
 		self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
 		self.milliseconds = int(str(time.time()).split('.')[1])
diff --git a/examples/guided.py b/examples/guided.py
index d47a949c..a927d86b 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -176,6 +176,15 @@ def ask_user_questions():
 			# packages installed by a profile may depend on audio and something may get installed anyways, not much we can do about that.
 			# we will not try to remove packages post-installation to not have audio, as that may cause multiple issues
 			archinstall.arguments['audio'] = None
+   
+   	# Ask what kernel user wants:
+	kernel = input("choose a kernel:\n1. linux\n2. linux-lts\n3. linux-zen")
+	try:
+		archinstall.arguments['kernel'] = ['linux', 'linux-lts', 'linux-zen'][int(kernel) - 1]
+	except:
+		archinstall.log('invalid kernel selected. defaulting to \'linux\'.')
+		archinstall.arguments['kernel'] = 'linux'
+
 
 	# Additional packages (with some light weight error handling for invalid package names)
 	if not archinstall.arguments.get('packages', None):
@@ -272,7 +281,7 @@ def perform_installation(mountpoint):
 	Only requirement is that the block devices are
 	formatted and setup prior to entering this function.
 	"""
-	with archinstall.Installer(mountpoint) as installation:
+	with archinstall.Installer(mountpoint, kernel=archinstall.arguments['kernel']) as installation:
 		## if len(mirrors):
 		# Certain services might be running that affects the system during installation.
 		# Currently, only one such service is "reflector.service" which updates /etc/pacman.d/mirrorlist
-- 
cgit v1.2.3-54-g00ecf


From f6fdc119276457d18d5ff1fb30ab9ff06826f576 Mon Sep 17 00:00:00 2001
From: Aggam Rahamim <agamclass@gmail.com>
Date: Fri, 16 Apr 2021 13:54:22 +0300
Subject: fixing - letting user choose kernel

---
 .gitignore                   |   3 +-
 archinstall/lib/installer.py |   4 +-
 "archiso;\n\t\techo Running" |   0
 examples/guided.py           |   2 +-
 guided.py                    | 359 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 364 insertions(+), 4 deletions(-)
 create mode 100644 "archiso;\n\t\techo Running"
 create mode 100644 guided.py

diff --git a/.gitignore b/.gitignore
index 246880ba..78595b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ SAFETY_LOCK
 **/**.network
 **/**.target
 **/**.qcow2
-**/test.py
\ No newline at end of file
+**/test.py
+**/archiso
\ No newline at end of file
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index d21040fa..9b0f9c8b 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -34,8 +34,8 @@ class Installer():
 	:type hostname: str, optional
 
 	"""
-	def __init__(self, target, *, base_packages='base base-devel linux-firmware efibootmgr', kernel='linux'):
-		base_packages += ' '+kernel
+	def __init__(self, target, *, base_packages=' base base-devel linux-firmware efibootmgr', kernel='linux'):
+		base_packages = kernel + base_packages
 		self.target = target
 		self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
 		self.milliseconds = int(str(time.time()).split('.')[1])
diff --git "a/archiso;\n\t\techo Running" "b/archiso;\n\t\techo Running"
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/guided.py b/examples/guided.py
index a927d86b..f4ab0b70 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -178,7 +178,7 @@ def ask_user_questions():
 			archinstall.arguments['audio'] = None
    
    	# Ask what kernel user wants:
-	kernel = input("choose a kernel:\n1. linux\n2. linux-lts\n3. linux-zen")
+	kernel = input("\n1. linux\n2. linux-lts\n3. linux-zen\nchoose a kernel of the following: ")
 	try:
 		archinstall.arguments['kernel'] = ['linux', 'linux-lts', 'linux-zen'][int(kernel) - 1]
 	except:
diff --git a/guided.py b/guided.py
new file mode 100644
index 00000000..a927d86b
--- /dev/null
+++ b/guided.py
@@ -0,0 +1,359 @@
+import getpass, time, json, os
+import archinstall
+from archinstall.lib.hardware import hasUEFI
+from archinstall.lib.profiles import Profile
+
+if hasUEFI() is False:
+	log("ArchInstall currently only supports machines booted with UEFI. MBR & GRUB support is coming in version 2.2.0!", fg="red", level=archinstall.LOG_LEVELS.Error)
+	exit(1)
+
+def ask_user_questions():
+	"""
+	  First, we'll ask the user for a bunch of user input.
+	  Not until we're satisfied with what we want to install
+	  will we continue with the actual installation steps.
+	"""
+	if not archinstall.arguments.get('keyboard-language', None):
+		archinstall.arguments['keyboard-language'] = archinstall.select_language(archinstall.list_keyboard_languages()).strip()
+
+	# Before continuing, set the preferred keyboard layout/language in the current terminal.
+	# This will just help the user with the next following questions.
+	if len(archinstall.arguments['keyboard-language']):
+		archinstall.set_keyboard_language(archinstall.arguments['keyboard-language'])
+
+	# Set which region to download packages from during the installation
+	if not archinstall.arguments.get('mirror-region', None):
+		archinstall.arguments['mirror-region'] = archinstall.select_mirror_regions(archinstall.list_mirrors())
+	else:
+		selected_region = archinstall.arguments['mirror-region']
+		archinstall.arguments['mirror-region'] = {selected_region : archinstall.list_mirrors()[selected_region]}
+
+
+	# Ask which harddrive/block-device we will install to
+	if archinstall.arguments.get('harddrive', None):
+		archinstall.arguments['harddrive'] = archinstall.BlockDevice(archinstall.arguments['harddrive'])
+	else:
+		archinstall.arguments['harddrive'] = archinstall.select_disk(archinstall.all_disks())
+		if archinstall.arguments['harddrive'] is None:
+			archinstall.arguments['target-mount'] = '/mnt'
+
+	# Perform a quick sanity check on the selected harddrive.
+	# 1. Check if it has partitions
+	# 3. Check that we support the current partitions
+	# 2. If so, ask if we should keep them or wipe everything
+	if archinstall.arguments['harddrive'] and archinstall.arguments['harddrive'].has_partitions():
+		archinstall.log(f"{archinstall.arguments['harddrive']} contains the following partitions:", fg='yellow')
+
+		# We curate a list pf supported partitions
+		# and print those that we don't support.
+		partition_mountpoints = {}
+		for partition in archinstall.arguments['harddrive']:
+			try:
+				if partition.filesystem_supported():
+					archinstall.log(f" {partition}")
+					partition_mountpoints[partition] = None
+			except archinstall.UnknownFilesystemFormat as err:
+				archinstall.log(f" {partition} (Filesystem not supported)", fg='red')
+
+		# We then ask what to do with the partitions.
+		if (option := archinstall.ask_for_disk_layout()) == 'abort':
+			archinstall.log(f"Safely aborting the installation. No changes to the disk or system has been made.")
+			exit(1)
+		elif option == 'keep-existing':
+			archinstall.arguments['harddrive'].keep_partitions = True
+
+			archinstall.log(f" ** You will now select which partitions to use by selecting mount points (inside the installation). **")
+			archinstall.log(f" ** The root would be a simple / and the boot partition /boot (as all paths are relative inside the installation). **")
+			while True:
+				# Select a partition
+				partition = archinstall.generic_select(partition_mountpoints.keys(),
+														"Select a partition by number that you want to set a mount-point for (leave blank when done): ")
+				if not partition:
+					break
+
+				# Select a mount-point
+				mountpoint = input(f"Enter a mount-point for {partition}: ").strip(' ')
+				if len(mountpoint):
+
+					# Get a valid & supported filesystem for the partition:
+					while 1:
+						new_filesystem = input(f"Enter a valid filesystem for {partition} (leave blank for {partition.filesystem}): ").strip(' ')
+						if len(new_filesystem) <= 0:
+							if partition.encrypted and partition.filesystem == 'crypto_LUKS':
+								old_password = archinstall.arguments.get('!encryption-password', None)
+								if not old_password:
+									old_password = input(f'Enter the old encryption password for {partition}: ')
+
+								if (autodetected_filesystem := partition.detect_inner_filesystem(old_password)):
+									new_filesystem = autodetected_filesystem
+								else:
+									archinstall.log(f"Could not auto-detect the filesystem inside the encrypted volume.", fg='red')
+									archinstall.log(f"A filesystem must be defined for the unlocked encrypted partition.")
+									continue
+							break
+
+						# Since the potentially new filesystem is new
+						# we have to check if we support it. We can do this by formatting /dev/null with the partitions filesystem.
+						# There's a nice wrapper for this on the partition object itself that supports a path-override during .format()
+						try:
+							partition.format(new_filesystem, path='/dev/null', log_formating=False, allow_formatting=True)
+						except archinstall.UnknownFilesystemFormat:
+							archinstall.log(f"Selected filesystem is not supported yet. If you want archinstall to support '{new_filesystem}', please create a issue-ticket suggesting it on github at https://github.com/archlinux/archinstall/issues.")
+							archinstall.log(f"Until then, please enter another supported filesystem.")
+							continue
+						except archinstall.SysCallError:
+							pass # Expected exception since mkfs.<format> can not format /dev/null.
+								 # But that means our .format() function supported it.
+						break
+
+					# When we've selected all three criteria,
+					# We can safely mark the partition for formatting and where to mount it.
+					# TODO: allow_formatting might be redundant since target_mountpoint should only be
+					#       set if we actually want to format it anyway.
+					partition.allow_formatting = True
+					partition.target_mountpoint = mountpoint
+					# Only overwrite the filesystem definition if we selected one:
+					if len(new_filesystem):
+						partition.filesystem = new_filesystem
+
+			archinstall.log('Using existing partition table reported above.')
+		elif option == 'format-all':
+			archinstall.arguments['filesystem'] = archinstall.ask_for_main_filesystem_format()
+			archinstall.arguments['harddrive'].keep_partitions = False
+	elif archinstall.arguments['harddrive']:
+		# If the drive doesn't have any partitions, safely mark the disk with keep_partitions = False
+		# and ask the user for a root filesystem.
+		archinstall.arguments['filesystem'] = archinstall.ask_for_main_filesystem_format()
+		archinstall.arguments['harddrive'].keep_partitions = False
+
+	# Get disk encryption password (or skip if blank)
+	if archinstall.arguments['harddrive'] and archinstall.arguments.get('!encryption-password', None) is None:
+		if (passwd := archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): ')):
+			archinstall.arguments['!encryption-password'] = passwd
+			archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['!encryption-password']
+
+	# Get the hostname for the machine
+	if not archinstall.arguments.get('hostname', None):
+		archinstall.arguments['hostname'] = input('Desired hostname for the installation: ').strip(' ')
+
+	# Ask for a root password (optional, but triggers requirement for super-user if skipped)
+	if not archinstall.arguments.get('!root-password', None):
+		archinstall.arguments['!root-password'] = archinstall.get_password(prompt='Enter root password (Recommendation: leave blank to leave root disabled): ')
+
+	# Ask for additional users (super-user if root pw was not set)
+	archinstall.arguments['users'] = {}
+	archinstall.arguments['superusers'] = {}
+	if not archinstall.arguments.get('!root-password', None):
+		archinstall.arguments['superusers'] = archinstall.ask_for_superuser_account('Create a required super-user with sudo privileges: ', forced=True)
+
+	users, superusers = archinstall.ask_for_additional_users('Enter a username to create a additional user (leave blank to skip & continue): ')
+	archinstall.arguments['users'] = users
+	archinstall.arguments['superusers'] = {**archinstall.arguments['superusers'], **superusers}
+
+	# Ask for archinstall-specific profiles (such as desktop environments etc)
+	if not archinstall.arguments.get('profile', None):
+		archinstall.arguments['profile'] = archinstall.select_profile(filter(lambda profile: (Profile(None, profile).is_top_level_profile()), archinstall.list_profiles()))
+	else:
+		archinstall.arguments['profile'] = archinstall.list_profiles()[archinstall.arguments['profile']]
+
+	# Check the potentially selected profiles preparations to get early checks if some additional questions are needed.
+	if archinstall.arguments['profile'] and archinstall.arguments['profile'].has_prep_function():
+		with archinstall.arguments['profile'].load_instructions(namespace=f"{archinstall.arguments['profile'].namespace}.py") as imported:
+			if not imported._prep_function():
+				archinstall.log(
+					' * Profile\'s preparation requirements was not fulfilled.',
+					fg='red'
+				)
+				exit(1)
+
+	# Ask about audio server selection if one is not already set
+	if not archinstall.arguments.get('audio', None):
+		
+		# only ask for audio server selection on a desktop profile 
+		if str(archinstall.arguments['profile']) == 'Profile(desktop)':
+			archinstall.arguments['audio'] = archinstall.ask_for_audio_selection()
+		else:
+			# packages installed by a profile may depend on audio and something may get installed anyways, not much we can do about that.
+			# we will not try to remove packages post-installation to not have audio, as that may cause multiple issues
+			archinstall.arguments['audio'] = None
+   
+   	# Ask what kernel user wants:
+	kernel = input("choose a kernel:\n1. linux\n2. linux-lts\n3. linux-zen")
+	try:
+		archinstall.arguments['kernel'] = ['linux', 'linux-lts', 'linux-zen'][int(kernel) - 1]
+	except:
+		archinstall.log('invalid kernel selected. defaulting to \'linux\'.')
+		archinstall.arguments['kernel'] = 'linux'
+
+
+	# Additional packages (with some light weight error handling for invalid package names)
+	if not archinstall.arguments.get('packages', None):
+		print("Packages not part of the desktop environment are not installed by default.")
+		print("If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt.")
+		archinstall.arguments['packages'] = [package for package in input('Write additional packages to install (space separated, leave blank to skip): ').split(' ') if len(package)]
+
+	if len(archinstall.arguments['packages']):
+		# Verify packages that were given
+		try:
+			archinstall.log(f"Verifying that additional packages exist (this might take a few seconds)")
+			archinstall.validate_package_list(archinstall.arguments['packages'])
+		except archinstall.RequirementError as e:
+			archinstall.log(e, fg='red')
+			exit(1)
+
+	# Ask or Call the helper function that asks the user to optionally configure a network.
+	if not archinstall.arguments.get('nic', None):
+		archinstall.arguments['nic'] = archinstall.ask_to_configure_network()
+		if not archinstall.arguments['nic']:
+			archinstall.log(f"No network configuration was selected. Network is going to be unavailable until configured manually!", fg="yellow")
+
+	if not archinstall.arguments.get('timezone', None):
+		archinstall.arguments['timezone'] = archinstall.ask_for_a_timezone()
+
+
+def perform_installation_steps():
+	print()
+	print('This is your chosen configuration:')
+	archinstall.log("-- Guided template chosen (with below config) --", level=archinstall.LOG_LEVELS.Debug)
+	archinstall.log(json.dumps(archinstall.arguments, indent=4, sort_keys=True, cls=archinstall.JSON), level=archinstall.LOG_LEVELS.Info)
+	print()
+
+	input('Press Enter to continue.')
+
+	"""
+		Issue a final warning before we continue with something un-revertable.
+		We mention the drive one last time, and count from 5 to 0.
+	"""
+
+	if archinstall.arguments.get('harddrive', None):
+		print(f" ! Formatting {archinstall.arguments['harddrive']} in ", end='')
+		archinstall.do_countdown()
+
+		"""
+			Setup the blockdevice, filesystem (and optionally encryption).
+			Once that's done, we'll hand over to perform_installation()
+		"""
+		with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
+			# Wipe the entire drive if the disk flag `keep_partitions`is False.
+			if archinstall.arguments['harddrive'].keep_partitions is False:
+				fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs'))
+			
+			# Check if encryption is desired and mark the root partition as encrypted.
+			if archinstall.arguments.get('!encryption-password', None):
+				root_partition = fs.find_partition('/')
+				root_partition.encrypted = True
+					
+			# After the disk is ready, iterate the partitions and check
+			# which ones are safe to format, and format those.
+			for partition in archinstall.arguments['harddrive']:
+				if partition.safe_to_format():
+					# Partition might be marked as encrypted due to the filesystem type crypt_LUKS
+					# But we might have omitted the encryption password question to skip encryption.
+					# In which case partition.encrypted will be true, but passwd will be false.
+					if partition.encrypted and (passwd := archinstall.arguments.get('!encryption-password', None)):
+						partition.encrypt(password=passwd)
+					else:
+						partition.format()
+				else:
+					archinstall.log(f"Did not format {partition} because .safe_to_format() returned False or .allow_formatting was False.", level=archinstall.LOG_LEVELS.Debug)
+
+			fs.find_partition('/boot').format('vfat')
+
+			if archinstall.arguments.get('!encryption-password', None):
+				# First encrypt and unlock, then format the desired partition inside the encrypted part.
+				# archinstall.luks2() encrypts the partition when entering the with context manager, and
+				# unlocks the drive so that it can be used as a normal block-device within archinstall.
+				with archinstall.luks2(fs.find_partition('/'), 'luksloop', archinstall.arguments.get('!encryption-password', None)) as unlocked_device:
+					unlocked_device.format(fs.find_partition('/').filesystem)
+					unlocked_device.mount('/mnt')
+			else:
+				fs.find_partition('/').format(fs.find_partition('/').filesystem)
+				fs.find_partition('/').mount('/mnt')
+
+			fs.find_partition('/boot').mount('/mnt/boot')
+	
+	perform_installation('/mnt')
+
+
+def perform_installation(mountpoint):
+	"""
+	Performs the installation steps on a block device.
+	Only requirement is that the block devices are
+	formatted and setup prior to entering this function.
+	"""
+	with archinstall.Installer(mountpoint, kernel=archinstall.arguments['kernel']) as installation:
+		## if len(mirrors):
+		# Certain services might be running that affects the system during installation.
+		# Currently, only one such service is "reflector.service" which updates /etc/pacman.d/mirrorlist
+		# We need to wait for it before we continue since we opted in to use a custom mirror/region.
+		installation.log(f'Waiting for automatic mirror selection (reflector) to complete.', level=archinstall.LOG_LEVELS.Info)
+		while archinstall.service_state('reflector') not in ('dead', 'failed'):
+			time.sleep(1)
+
+		# Set mirrors used by pacstrap (outside of installation)
+		if archinstall.arguments.get('mirror-region', None):
+			archinstall.use_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors for the live medium
+
+		if installation.minimal_installation():
+			installation.set_hostname(archinstall.arguments['hostname'])
+
+			# Configure the selected mirrors in the installation
+			if archinstall.arguments.get('mirror-region', None):
+				installation.set_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors in the installation medium
+
+			installation.set_keyboard_language(archinstall.arguments['keyboard-language'])
+			installation.add_bootloader()
+
+			# If user selected to copy the current ISO network configuration
+			# Perform a copy of the config
+			if archinstall.arguments.get('nic', {}) == 'Copy ISO network configuration to installation':
+				installation.copy_ISO_network_config(enable_services=True) # Sources the ISO network configuration to the install medium.
+			elif archinstall.arguments.get('nic', {}).get('NetworkManager',False):
+				installation.add_additional_packages("networkmanager")
+				installation.enable_service('NetworkManager.service')
+			# Otherwise, if a interface was selected, configure that interface
+			elif archinstall.arguments.get('nic', {}):
+				installation.configure_nic(**archinstall.arguments.get('nic', {}))
+				installation.enable_service('systemd-networkd')
+				installation.enable_service('systemd-resolved')
+
+			if 	archinstall.arguments.get('audio', None) != None:
+				installation.log(f"This audio server will be used: {archinstall.arguments.get('audio', None)}", level=archinstall.LOG_LEVELS.Info)
+				if archinstall.arguments.get('audio', None) == 'pipewire':
+					print('Installing pipewire ...')
+					installation.add_additional_packages(["pipewire", "pipewire-alsa", "pipewire-jack", "pipewire-media-session", "pipewire-pulse", "gst-plugin-pipewire", "libpulse"])
+				elif archinstall.arguments.get('audio', None) == 'pulseaudio':
+					print('Installing pulseaudio ...')
+					installation.add_additional_packages("pulseaudio")
+			else:
+				installation.log("No audio server will be installed.", level=archinstall.LOG_LEVELS.Info)
+			
+			if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
+				installation.add_additional_packages(archinstall.arguments.get('packages', None))
+
+			if archinstall.arguments.get('profile', None):
+				installation.install_profile(archinstall.arguments.get('profile', None))
+
+			for user, user_info in archinstall.arguments.get('users', {}).items():
+				installation.user_create(user, user_info["!password"], sudo=False)
+			
+			for superuser, user_info in archinstall.arguments.get('superusers', {}).items():
+				installation.user_create(superuser, user_info["!password"], sudo=True)
+
+			if (timezone := archinstall.arguments.get('timezone', None)):
+				installation.set_timezone(timezone)
+
+			if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
+				installation.user_set_pw('root', root_pw)
+
+		installation.log("For post-installation tips, see https://wiki.archlinux.org/index.php/Installation_guide#Post-installation", fg="yellow")
+		choice = input("Would you like to chroot into the newly created installation and perform post-installation configuration? [Y/n] ")
+		if choice.lower() in ("y", ""):
+			try:
+				installation.drop_to_shell()
+			except:
+				pass
+
+ask_user_questions()
+perform_installation_steps()
+
-- 
cgit v1.2.3-54-g00ecf


From 81b0fa1792716b9a5ec889003dba334d3987918b Mon Sep 17 00:00:00 2001
From: Aggam Rahamim <agamclass@gmail.com>
Date: Fri, 16 Apr 2021 14:31:59 +0300
Subject: fixed mkinitcpio

---
 archinstall/lib/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 9b0f9c8b..7f6311c9 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -323,7 +323,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
 
-- 
cgit v1.2.3-54-g00ecf


From 8b9f16a0284c5261a29b9818809cbe45a9c0c10b Mon Sep 17 00:00:00 2001
From: Aggam Rahamim <agamclass@gmail.com>
Date: Fri, 16 Apr 2021 14:43:17 +0300
Subject: removed new line when ask for kernel

---
 examples/guided.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/guided.py b/examples/guided.py
index f4ab0b70..e6abe872 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -178,7 +178,7 @@ def ask_user_questions():
 			archinstall.arguments['audio'] = None
    
    	# Ask what kernel user wants:
-	kernel = input("\n1. linux\n2. linux-lts\n3. linux-zen\nchoose a kernel of the following: ")
+	kernel = input("1. linux\n2. linux-lts\n3. linux-zen\nchoose a kernel of the following: ")
 	try:
 		archinstall.arguments['kernel'] = ['linux', 'linux-lts', 'linux-zen'][int(kernel) - 1]
 	except:
-- 
cgit v1.2.3-54-g00ecf


From b46afad1afb7d9e6621e86b3a512006c93ab8936 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Tue, 20 Apr 2021 12:27:17 -0400
Subject: Fix budgie.py merge issue

---
 profiles/budgie.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/profiles/budgie.py b/profiles/budgie.py
index 1f224209..6c5475ae 100644
--- a/profiles/budgie.py
+++ b/profiles/budgie.py
@@ -1,13 +1,7 @@
-<<<<<<< HEAD:profiles/cinnamon.py
-# A desktop environment using "Cinnamon"
-import archinstall
-
-=======
 # A desktop environment using "budgie"
 
 import archinstall
 
->>>>>>> master:profiles/budgie.py
 is_top_level_profile = False
 
 def _prep_function(*args, **kwargs):
@@ -18,11 +12,7 @@ def _prep_function(*args, **kwargs):
 	for more input before any other installer steps start.
 	"""
 
-<<<<<<< HEAD:profiles/cinnamon.py
-	# Cinnamon requires a functioning Xorg installation.
-=======
 	# budgie requires a functioning Xorg installation.
->>>>>>> master:profiles/budgie.py
 	profile = archinstall.Profile(None, 'xorg')
 	with profile.load_instructions(namespace='xorg.py') as imported:
 		if hasattr(imported, '_prep_function'):
@@ -31,17 +21,6 @@ def _prep_function(*args, **kwargs):
 			print('Deprecated (??): xorg profile has no _prep_function() anymore')
 
 # Ensures that this code only gets executed if executed
-<<<<<<< HEAD:profiles/cinnamon.py
-# through importlib.util.spec_from_file_location("cinnamon", "/somewhere/cinnamon.py")
-# or through conventional import cinnamon
-if __name__ == 'cinnamon':
-	# Install dependency profiles
-	installation.install_profile('xorg')
-
-	# Install the application cinnamon from the template under /applications/
-	cinnamon = archinstall.Application(installation, 'cinnamon')
-	cinnamon.install()
-=======
 # through importlib.util.spec_from_file_location("budgie", "/somewhere/budgie.py")
 # or through conventional import budgie
 if __name__ == 'budgie':
@@ -51,6 +30,5 @@ if __name__ == 'budgie':
 	# Install the application budgie from the template under /applications/
 	budgie = archinstall.Application(installation, 'budgie')
 	budgie.install()
->>>>>>> master:profiles/budgie.py
 
 	installation.enable_service('lightdm') # Light Display Manager
-- 
cgit v1.2.3-54-g00ecf


From 4db40c06eb37390eaa19b6d8b0afa7b21c5e65b3 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton.feeds@gmail.com>
Date: Wed, 21 Apr 2021 13:15:42 +0200
Subject: Removed guided.py that was copied in to the root and added to
 gitignore.

---
 .gitignore |   3 +-
 guided.py  | 359 -------------------------------------------------------------
 2 files changed, 2 insertions(+), 360 deletions(-)
 delete mode 100644 guided.py

diff --git a/.gitignore b/.gitignore
index 78595b08..a21815d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ SAFETY_LOCK
 **/**.target
 **/**.qcow2
 **/test.py
-**/archiso
\ No newline at end of file
+**/archiso
+/guided.py
diff --git a/guided.py b/guided.py
deleted file mode 100644
index a927d86b..00000000
--- a/guided.py
+++ /dev/null
@@ -1,359 +0,0 @@
-import getpass, time, json, os
-import archinstall
-from archinstall.lib.hardware import hasUEFI
-from archinstall.lib.profiles import Profile
-
-if hasUEFI() is False:
-	log("ArchInstall currently only supports machines booted with UEFI. MBR & GRUB support is coming in version 2.2.0!", fg="red", level=archinstall.LOG_LEVELS.Error)
-	exit(1)
-
-def ask_user_questions():
-	"""
-	  First, we'll ask the user for a bunch of user input.
-	  Not until we're satisfied with what we want to install
-	  will we continue with the actual installation steps.
-	"""
-	if not archinstall.arguments.get('keyboard-language', None):
-		archinstall.arguments['keyboard-language'] = archinstall.select_language(archinstall.list_keyboard_languages()).strip()
-
-	# Before continuing, set the preferred keyboard layout/language in the current terminal.
-	# This will just help the user with the next following questions.
-	if len(archinstall.arguments['keyboard-language']):
-		archinstall.set_keyboard_language(archinstall.arguments['keyboard-language'])
-
-	# Set which region to download packages from during the installation
-	if not archinstall.arguments.get('mirror-region', None):
-		archinstall.arguments['mirror-region'] = archinstall.select_mirror_regions(archinstall.list_mirrors())
-	else:
-		selected_region = archinstall.arguments['mirror-region']
-		archinstall.arguments['mirror-region'] = {selected_region : archinstall.list_mirrors()[selected_region]}
-
-
-	# Ask which harddrive/block-device we will install to
-	if archinstall.arguments.get('harddrive', None):
-		archinstall.arguments['harddrive'] = archinstall.BlockDevice(archinstall.arguments['harddrive'])
-	else:
-		archinstall.arguments['harddrive'] = archinstall.select_disk(archinstall.all_disks())
-		if archinstall.arguments['harddrive'] is None:
-			archinstall.arguments['target-mount'] = '/mnt'
-
-	# Perform a quick sanity check on the selected harddrive.
-	# 1. Check if it has partitions
-	# 3. Check that we support the current partitions
-	# 2. If so, ask if we should keep them or wipe everything
-	if archinstall.arguments['harddrive'] and archinstall.arguments['harddrive'].has_partitions():
-		archinstall.log(f"{archinstall.arguments['harddrive']} contains the following partitions:", fg='yellow')
-
-		# We curate a list pf supported partitions
-		# and print those that we don't support.
-		partition_mountpoints = {}
-		for partition in archinstall.arguments['harddrive']:
-			try:
-				if partition.filesystem_supported():
-					archinstall.log(f" {partition}")
-					partition_mountpoints[partition] = None
-			except archinstall.UnknownFilesystemFormat as err:
-				archinstall.log(f" {partition} (Filesystem not supported)", fg='red')
-
-		# We then ask what to do with the partitions.
-		if (option := archinstall.ask_for_disk_layout()) == 'abort':
-			archinstall.log(f"Safely aborting the installation. No changes to the disk or system has been made.")
-			exit(1)
-		elif option == 'keep-existing':
-			archinstall.arguments['harddrive'].keep_partitions = True
-
-			archinstall.log(f" ** You will now select which partitions to use by selecting mount points (inside the installation). **")
-			archinstall.log(f" ** The root would be a simple / and the boot partition /boot (as all paths are relative inside the installation). **")
-			while True:
-				# Select a partition
-				partition = archinstall.generic_select(partition_mountpoints.keys(),
-														"Select a partition by number that you want to set a mount-point for (leave blank when done): ")
-				if not partition:
-					break
-
-				# Select a mount-point
-				mountpoint = input(f"Enter a mount-point for {partition}: ").strip(' ')
-				if len(mountpoint):
-
-					# Get a valid & supported filesystem for the partition:
-					while 1:
-						new_filesystem = input(f"Enter a valid filesystem for {partition} (leave blank for {partition.filesystem}): ").strip(' ')
-						if len(new_filesystem) <= 0:
-							if partition.encrypted and partition.filesystem == 'crypto_LUKS':
-								old_password = archinstall.arguments.get('!encryption-password', None)
-								if not old_password:
-									old_password = input(f'Enter the old encryption password for {partition}: ')
-
-								if (autodetected_filesystem := partition.detect_inner_filesystem(old_password)):
-									new_filesystem = autodetected_filesystem
-								else:
-									archinstall.log(f"Could not auto-detect the filesystem inside the encrypted volume.", fg='red')
-									archinstall.log(f"A filesystem must be defined for the unlocked encrypted partition.")
-									continue
-							break
-
-						# Since the potentially new filesystem is new
-						# we have to check if we support it. We can do this by formatting /dev/null with the partitions filesystem.
-						# There's a nice wrapper for this on the partition object itself that supports a path-override during .format()
-						try:
-							partition.format(new_filesystem, path='/dev/null', log_formating=False, allow_formatting=True)
-						except archinstall.UnknownFilesystemFormat:
-							archinstall.log(f"Selected filesystem is not supported yet. If you want archinstall to support '{new_filesystem}', please create a issue-ticket suggesting it on github at https://github.com/archlinux/archinstall/issues.")
-							archinstall.log(f"Until then, please enter another supported filesystem.")
-							continue
-						except archinstall.SysCallError:
-							pass # Expected exception since mkfs.<format> can not format /dev/null.
-								 # But that means our .format() function supported it.
-						break
-
-					# When we've selected all three criteria,
-					# We can safely mark the partition for formatting and where to mount it.
-					# TODO: allow_formatting might be redundant since target_mountpoint should only be
-					#       set if we actually want to format it anyway.
-					partition.allow_formatting = True
-					partition.target_mountpoint = mountpoint
-					# Only overwrite the filesystem definition if we selected one:
-					if len(new_filesystem):
-						partition.filesystem = new_filesystem
-
-			archinstall.log('Using existing partition table reported above.')
-		elif option == 'format-all':
-			archinstall.arguments['filesystem'] = archinstall.ask_for_main_filesystem_format()
-			archinstall.arguments['harddrive'].keep_partitions = False
-	elif archinstall.arguments['harddrive']:
-		# If the drive doesn't have any partitions, safely mark the disk with keep_partitions = False
-		# and ask the user for a root filesystem.
-		archinstall.arguments['filesystem'] = archinstall.ask_for_main_filesystem_format()
-		archinstall.arguments['harddrive'].keep_partitions = False
-
-	# Get disk encryption password (or skip if blank)
-	if archinstall.arguments['harddrive'] and archinstall.arguments.get('!encryption-password', None) is None:
-		if (passwd := archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): ')):
-			archinstall.arguments['!encryption-password'] = passwd
-			archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['!encryption-password']
-
-	# Get the hostname for the machine
-	if not archinstall.arguments.get('hostname', None):
-		archinstall.arguments['hostname'] = input('Desired hostname for the installation: ').strip(' ')
-
-	# Ask for a root password (optional, but triggers requirement for super-user if skipped)
-	if not archinstall.arguments.get('!root-password', None):
-		archinstall.arguments['!root-password'] = archinstall.get_password(prompt='Enter root password (Recommendation: leave blank to leave root disabled): ')
-
-	# Ask for additional users (super-user if root pw was not set)
-	archinstall.arguments['users'] = {}
-	archinstall.arguments['superusers'] = {}
-	if not archinstall.arguments.get('!root-password', None):
-		archinstall.arguments['superusers'] = archinstall.ask_for_superuser_account('Create a required super-user with sudo privileges: ', forced=True)
-
-	users, superusers = archinstall.ask_for_additional_users('Enter a username to create a additional user (leave blank to skip & continue): ')
-	archinstall.arguments['users'] = users
-	archinstall.arguments['superusers'] = {**archinstall.arguments['superusers'], **superusers}
-
-	# Ask for archinstall-specific profiles (such as desktop environments etc)
-	if not archinstall.arguments.get('profile', None):
-		archinstall.arguments['profile'] = archinstall.select_profile(filter(lambda profile: (Profile(None, profile).is_top_level_profile()), archinstall.list_profiles()))
-	else:
-		archinstall.arguments['profile'] = archinstall.list_profiles()[archinstall.arguments['profile']]
-
-	# Check the potentially selected profiles preparations to get early checks if some additional questions are needed.
-	if archinstall.arguments['profile'] and archinstall.arguments['profile'].has_prep_function():
-		with archinstall.arguments['profile'].load_instructions(namespace=f"{archinstall.arguments['profile'].namespace}.py") as imported:
-			if not imported._prep_function():
-				archinstall.log(
-					' * Profile\'s preparation requirements was not fulfilled.',
-					fg='red'
-				)
-				exit(1)
-
-	# Ask about audio server selection if one is not already set
-	if not archinstall.arguments.get('audio', None):
-		
-		# only ask for audio server selection on a desktop profile 
-		if str(archinstall.arguments['profile']) == 'Profile(desktop)':
-			archinstall.arguments['audio'] = archinstall.ask_for_audio_selection()
-		else:
-			# packages installed by a profile may depend on audio and something may get installed anyways, not much we can do about that.
-			# we will not try to remove packages post-installation to not have audio, as that may cause multiple issues
-			archinstall.arguments['audio'] = None
-   
-   	# Ask what kernel user wants:
-	kernel = input("choose a kernel:\n1. linux\n2. linux-lts\n3. linux-zen")
-	try:
-		archinstall.arguments['kernel'] = ['linux', 'linux-lts', 'linux-zen'][int(kernel) - 1]
-	except:
-		archinstall.log('invalid kernel selected. defaulting to \'linux\'.')
-		archinstall.arguments['kernel'] = 'linux'
-
-
-	# Additional packages (with some light weight error handling for invalid package names)
-	if not archinstall.arguments.get('packages', None):
-		print("Packages not part of the desktop environment are not installed by default.")
-		print("If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt.")
-		archinstall.arguments['packages'] = [package for package in input('Write additional packages to install (space separated, leave blank to skip): ').split(' ') if len(package)]
-
-	if len(archinstall.arguments['packages']):
-		# Verify packages that were given
-		try:
-			archinstall.log(f"Verifying that additional packages exist (this might take a few seconds)")
-			archinstall.validate_package_list(archinstall.arguments['packages'])
-		except archinstall.RequirementError as e:
-			archinstall.log(e, fg='red')
-			exit(1)
-
-	# Ask or Call the helper function that asks the user to optionally configure a network.
-	if not archinstall.arguments.get('nic', None):
-		archinstall.arguments['nic'] = archinstall.ask_to_configure_network()
-		if not archinstall.arguments['nic']:
-			archinstall.log(f"No network configuration was selected. Network is going to be unavailable until configured manually!", fg="yellow")
-
-	if not archinstall.arguments.get('timezone', None):
-		archinstall.arguments['timezone'] = archinstall.ask_for_a_timezone()
-
-
-def perform_installation_steps():
-	print()
-	print('This is your chosen configuration:')
-	archinstall.log("-- Guided template chosen (with below config) --", level=archinstall.LOG_LEVELS.Debug)
-	archinstall.log(json.dumps(archinstall.arguments, indent=4, sort_keys=True, cls=archinstall.JSON), level=archinstall.LOG_LEVELS.Info)
-	print()
-
-	input('Press Enter to continue.')
-
-	"""
-		Issue a final warning before we continue with something un-revertable.
-		We mention the drive one last time, and count from 5 to 0.
-	"""
-
-	if archinstall.arguments.get('harddrive', None):
-		print(f" ! Formatting {archinstall.arguments['harddrive']} in ", end='')
-		archinstall.do_countdown()
-
-		"""
-			Setup the blockdevice, filesystem (and optionally encryption).
-			Once that's done, we'll hand over to perform_installation()
-		"""
-		with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
-			# Wipe the entire drive if the disk flag `keep_partitions`is False.
-			if archinstall.arguments['harddrive'].keep_partitions is False:
-				fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs'))
-			
-			# Check if encryption is desired and mark the root partition as encrypted.
-			if archinstall.arguments.get('!encryption-password', None):
-				root_partition = fs.find_partition('/')
-				root_partition.encrypted = True
-					
-			# After the disk is ready, iterate the partitions and check
-			# which ones are safe to format, and format those.
-			for partition in archinstall.arguments['harddrive']:
-				if partition.safe_to_format():
-					# Partition might be marked as encrypted due to the filesystem type crypt_LUKS
-					# But we might have omitted the encryption password question to skip encryption.
-					# In which case partition.encrypted will be true, but passwd will be false.
-					if partition.encrypted and (passwd := archinstall.arguments.get('!encryption-password', None)):
-						partition.encrypt(password=passwd)
-					else:
-						partition.format()
-				else:
-					archinstall.log(f"Did not format {partition} because .safe_to_format() returned False or .allow_formatting was False.", level=archinstall.LOG_LEVELS.Debug)
-
-			fs.find_partition('/boot').format('vfat')
-
-			if archinstall.arguments.get('!encryption-password', None):
-				# First encrypt and unlock, then format the desired partition inside the encrypted part.
-				# archinstall.luks2() encrypts the partition when entering the with context manager, and
-				# unlocks the drive so that it can be used as a normal block-device within archinstall.
-				with archinstall.luks2(fs.find_partition('/'), 'luksloop', archinstall.arguments.get('!encryption-password', None)) as unlocked_device:
-					unlocked_device.format(fs.find_partition('/').filesystem)
-					unlocked_device.mount('/mnt')
-			else:
-				fs.find_partition('/').format(fs.find_partition('/').filesystem)
-				fs.find_partition('/').mount('/mnt')
-
-			fs.find_partition('/boot').mount('/mnt/boot')
-	
-	perform_installation('/mnt')
-
-
-def perform_installation(mountpoint):
-	"""
-	Performs the installation steps on a block device.
-	Only requirement is that the block devices are
-	formatted and setup prior to entering this function.
-	"""
-	with archinstall.Installer(mountpoint, kernel=archinstall.arguments['kernel']) as installation:
-		## if len(mirrors):
-		# Certain services might be running that affects the system during installation.
-		# Currently, only one such service is "reflector.service" which updates /etc/pacman.d/mirrorlist
-		# We need to wait for it before we continue since we opted in to use a custom mirror/region.
-		installation.log(f'Waiting for automatic mirror selection (reflector) to complete.', level=archinstall.LOG_LEVELS.Info)
-		while archinstall.service_state('reflector') not in ('dead', 'failed'):
-			time.sleep(1)
-
-		# Set mirrors used by pacstrap (outside of installation)
-		if archinstall.arguments.get('mirror-region', None):
-			archinstall.use_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors for the live medium
-
-		if installation.minimal_installation():
-			installation.set_hostname(archinstall.arguments['hostname'])
-
-			# Configure the selected mirrors in the installation
-			if archinstall.arguments.get('mirror-region', None):
-				installation.set_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors in the installation medium
-
-			installation.set_keyboard_language(archinstall.arguments['keyboard-language'])
-			installation.add_bootloader()
-
-			# If user selected to copy the current ISO network configuration
-			# Perform a copy of the config
-			if archinstall.arguments.get('nic', {}) == 'Copy ISO network configuration to installation':
-				installation.copy_ISO_network_config(enable_services=True) # Sources the ISO network configuration to the install medium.
-			elif archinstall.arguments.get('nic', {}).get('NetworkManager',False):
-				installation.add_additional_packages("networkmanager")
-				installation.enable_service('NetworkManager.service')
-			# Otherwise, if a interface was selected, configure that interface
-			elif archinstall.arguments.get('nic', {}):
-				installation.configure_nic(**archinstall.arguments.get('nic', {}))
-				installation.enable_service('systemd-networkd')
-				installation.enable_service('systemd-resolved')
-
-			if 	archinstall.arguments.get('audio', None) != None:
-				installation.log(f"This audio server will be used: {archinstall.arguments.get('audio', None)}", level=archinstall.LOG_LEVELS.Info)
-				if archinstall.arguments.get('audio', None) == 'pipewire':
-					print('Installing pipewire ...')
-					installation.add_additional_packages(["pipewire", "pipewire-alsa", "pipewire-jack", "pipewire-media-session", "pipewire-pulse", "gst-plugin-pipewire", "libpulse"])
-				elif archinstall.arguments.get('audio', None) == 'pulseaudio':
-					print('Installing pulseaudio ...')
-					installation.add_additional_packages("pulseaudio")
-			else:
-				installation.log("No audio server will be installed.", level=archinstall.LOG_LEVELS.Info)
-			
-			if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
-				installation.add_additional_packages(archinstall.arguments.get('packages', None))
-
-			if archinstall.arguments.get('profile', None):
-				installation.install_profile(archinstall.arguments.get('profile', None))
-
-			for user, user_info in archinstall.arguments.get('users', {}).items():
-				installation.user_create(user, user_info["!password"], sudo=False)
-			
-			for superuser, user_info in archinstall.arguments.get('superusers', {}).items():
-				installation.user_create(superuser, user_info["!password"], sudo=True)
-
-			if (timezone := archinstall.arguments.get('timezone', None)):
-				installation.set_timezone(timezone)
-
-			if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
-				installation.user_set_pw('root', root_pw)
-
-		installation.log("For post-installation tips, see https://wiki.archlinux.org/index.php/Installation_guide#Post-installation", fg="yellow")
-		choice = input("Would you like to chroot into the newly created installation and perform post-installation configuration? [Y/n] ")
-		if choice.lower() in ("y", ""):
-			try:
-				installation.drop_to_shell()
-			except:
-				pass
-
-ask_user_questions()
-perform_installation_steps()
-
-- 
cgit v1.2.3-54-g00ecf


From 5c9859d316b8064949370c03745cfd99e0d67670 Mon Sep 17 00:00:00 2001
From: Aggam Rahamim <agamclass@gmail.com>
Date: Sun, 25 Apr 2021 14:55:39 +0300
Subject: having ability to use multiple kernels

---
 archinstall/lib/installer.py        |  4 ++--
 archinstall/lib/user_interaction.py |  4 +++-
 examples/guided.py                  | 19 +++++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 7f6311c9..d952a6ed 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -34,8 +34,8 @@ class Installer():
 	:type hostname: str, optional
 
 	"""
-	def __init__(self, target, *, base_packages=' base base-devel linux-firmware efibootmgr', kernel='linux'):
-		base_packages = kernel + base_packages
+	def __init__(self, target, *, base_packages='base base-devel linux-firmware efibootmgr ', 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])
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 99cf6274..3da24684 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -218,6 +218,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)
@@ -263,7 +265,7 @@ def select_disk(dict_o_disks):
 		elif drive.isdigit():
 			drive = int(drive)
 			if drive >= len(drives):
-				raise DiskError(f'Selected option "{drive}" is out of range')
+				raise Dis1ror(f'Selected option "{drive}" is out of range')
 			drive = dict_o_disks[drives[drive]]
 		elif drive in dict_o_disks:
 			drive = dict_o_disks[drive]
diff --git a/examples/guided.py b/examples/guided.py
index e6abe872..ee7b63d9 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -2,6 +2,7 @@ import getpass, time, json, os
 import archinstall
 from archinstall.lib.hardware import hasUEFI
 from archinstall.lib.profiles import Profile
+from archinstall.lib.user_interaction import generic_select
 
 if hasUEFI() is False:
 	log("ArchInstall currently only supports machines booted with UEFI. MBR & GRUB support is coming in version 2.2.0!", fg="red", level=archinstall.LOG_LEVELS.Error)
@@ -168,7 +169,6 @@ def ask_user_questions():
 
 	# Ask about audio server selection if one is not already set
 	if not archinstall.arguments.get('audio', None):
-		
 		# only ask for audio server selection on a desktop profile 
 		if str(archinstall.arguments['profile']) == 'Profile(desktop)':
 			archinstall.arguments['audio'] = archinstall.ask_for_audio_selection()
@@ -178,12 +178,15 @@ def ask_user_questions():
 			archinstall.arguments['audio'] = None
    
    	# Ask what kernel user wants:
-	kernel = input("1. linux\n2. linux-lts\n3. linux-zen\nchoose a kernel of the following: ")
-	try:
-		archinstall.arguments['kernel'] = ['linux', 'linux-lts', 'linux-zen'][int(kernel) - 1]
-	except:
-		archinstall.log('invalid kernel selected. defaulting to \'linux\'.')
-		archinstall.arguments['kernel'] = 'linux'
+	while True:
+		kernel = generic_select(["linux", "linux-lts", "linux-zen", "continue"], "choose a kernel:")
+		if (archinstall.arguments['kernels'] == None or archinstall.arguments['kernels'] == ""):
+			archinstall.arguments['kernels'] = kernel
+		else:
+			if (kernel == "continue"):
+				break
+			archinstall.arguments['kernels'] += "," + kernel
+
 
 
 	# Additional packages (with some light weight error handling for invalid package names)
@@ -281,7 +284,7 @@ def perform_installation(mountpoint):
 	Only requirement is that the block devices are
 	formatted and setup prior to entering this function.
 	"""
-	with archinstall.Installer(mountpoint, kernel=archinstall.arguments['kernel']) as installation:
+	with archinstall.Installer(mountpoint, kernels=archinstall.arguments['kernels']) as installation:
 		## if len(mirrors):
 		# Certain services might be running that affects the system during installation.
 		# Currently, only one such service is "reflector.service" which updates /etc/pacman.d/mirrorlist
-- 
cgit v1.2.3-54-g00ecf


From fa9a08b86dd902ef5c5277b098fc22031de271df Mon Sep 17 00:00:00 2001
From: Aggam Rahamim <agamclass@gmail.com>
Date: Tue, 27 Apr 2021 12:40:05 +0300
Subject: having ability to use multiple kernels - dict fix

---
 examples/guided.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/guided.py b/examples/guided.py
index ddc4d06f..4df1d9de 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -190,7 +190,7 @@ def ask_user_questions():
    	# Ask what kernel user wants:
 	while True:
 		kernel = generic_select(["linux", "linux-lts", "linux-zen", "continue"], "choose a kernel:")
-		if (archinstall.arguments['kernels'] == None or archinstall.arguments['kernels'] == ""):
+		if (archinstall.arguments.get("kernels", None) == None):
 			archinstall.arguments['kernels'] = kernel
 		else:
 			if (kernel == "continue"):
-- 
cgit v1.2.3-54-g00ecf


From 1be405aa77f809d847eb6eb8ad58ee8c9574452f Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton.feeds+github@gmail.com>
Date: Tue, 27 Apr 2021 12:26:59 +0200
Subject: Corrected indentation (mixed spaces and tabs)

---
 examples/guided.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/guided.py b/examples/guided.py
index 4df1d9de..6177e5ac 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -186,8 +186,8 @@ def ask_user_questions():
 			# packages installed by a profile may depend on audio and something may get installed anyways, not much we can do about that.
 			# we will not try to remove packages post-installation to not have audio, as that may cause multiple issues
 			archinstall.arguments['audio'] = None
-   
-   	# Ask what kernel user wants:
+
+	# Ask what kernel user wants:
 	while True:
 		kernel = generic_select(["linux", "linux-lts", "linux-zen", "continue"], "choose a kernel:")
 		if (archinstall.arguments.get("kernels", None) == None):
@@ -384,4 +384,4 @@ def perform_installation(mountpoint):
 				pass
 
 ask_user_questions()
-perform_installation_steps()
\ No newline at end of file
+perform_installation_steps()
-- 
cgit v1.2.3-54-g00ecf


From 847cb3d032498e03f27b9bffede04faa5ac4361f Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton.feeds+github@gmail.com>
Date: Tue, 27 Apr 2021 12:27:49 +0200
Subject: Spelling error

---
 archinstall/lib/user_interaction.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index b93f88b3..f801ec83 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -267,7 +267,7 @@ def select_disk(dict_o_disks):
 		elif drive.isdigit():
 			drive = int(drive)
 			if drive >= len(drives):
-				raise Dis1ror(f'Selected option "{drive}" is out of range')
+				raise DiskError(f'Selected option "{drive}" is out of range')
 			drive = dict_o_disks[drives[drive]]
 		elif drive in dict_o_disks:
 			drive = dict_o_disks[drive]
-- 
cgit v1.2.3-54-g00ecf


From b6cd5835f19e15f41a41ac8172e5dabb3cb7fa39 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton.feeds@gmail.com>
Date: Tue, 27 Apr 2021 12:37:16 +0200
Subject: Reduced complexity in guided for the kernel selection process.

---
 examples/guided.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/examples/guided.py b/examples/guided.py
index f4cf097e..52ee07a6 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -189,16 +189,13 @@ def ask_user_questions():
 			archinstall.arguments['audio'] = None
 
 	# Ask what kernel user wants:
-	while True:
-		kernel = generic_select(["linux", "linux-lts", "linux-zen", "continue"], "choose a kernel:")
-		if (archinstall.arguments.get("kernels", None) == None):
+	if not archinstall.arguments.get("kernels", None):
+		archinstall.log(f"Here you can choose which kernel to use, leave blank for default which is 'linux'.")
+
+		if (kernel := generic_select(["linux", "linux-lts", "linux-zen", "continue"], "choose a kernel:")):
 			archinstall.arguments['kernels'] = kernel
 		else:
-			if (kernel == "continue"):
-				break
-			archinstall.arguments['kernels'] += "," + kernel
-
-
+			archinstall.arguments['kernels'] = 'linux'
 
 	# Additional packages (with some light weight error handling for invalid package names)
 	while True:
-- 
cgit v1.2.3-54-g00ecf


From 2762144e32413ee8d6df433d31bc7b096d11e700 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton.feeds@gmail.com>
Date: Tue, 27 Apr 2021 12:39:13 +0200
Subject: Added a failsafe for kernels argument to be defaulted to linux, since
 'None' could technically end up here.

---
 examples/guided.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/guided.py b/examples/guided.py
index 52ee07a6..6d8155c7 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -301,7 +301,7 @@ def perform_installation(mountpoint):
 	Only requirement is that the block devices are
 	formatted and setup prior to entering this function.
 	"""
-	with archinstall.Installer(mountpoint, kernels=archinstall.arguments['kernels']) as installation:
+	with archinstall.Installer(mountpoint, kernels=archinstall.arguments.get('kernels', 'linux')) as installation:
 		## if len(mirrors):
 		# Certain services might be running that affects the system during installation.
 		# Currently, only one such service is "reflector.service" which updates /etc/pacman.d/mirrorlist
-- 
cgit v1.2.3-54-g00ecf