Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorAggam Rahamim <agamclass@gmail.com>2021-04-25 14:55:39 +0300
committerAggam Rahamim <agamclass@gmail.com>2021-04-25 14:55:39 +0300
commit5c9859d316b8064949370c03745cfd99e0d67670 (patch)
treed697dcb0595a653a2ed269df4568c90c92a4107b /archinstall
parent8b9f16a0284c5261a29b9818809cbe45a9c0c10b (diff)
having ability to use multiple kernels
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/installer.py4
-rw-r--r--archinstall/lib/user_interaction.py4
2 files changed, 5 insertions, 3 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]