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@hvornum.se>2021-04-28 05:38:16 +0000
committerGitHub <noreply@github.com>2021-04-28 05:38:16 +0000
commit932517e20d92a1e69c258aa58f387246248eaff7 (patch)
treec7645e3a8275afbb2ddea73f08e74ab494f67403 /archinstall/lib
parente7a429db117313294ebeee2cc460405ba28da8b8 (diff)
parent0e89173ddf4827353874c611fba75f99d9693e27 (diff)
Merge pull request #366 from advaithm/master
Bug fixes for kernel select and grub-install
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/installer.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 577a2ae1..a5449662 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -1,6 +1,5 @@
import os, stat, time, shutil, pathlib
import subprocess, logging
-
from .exceptions import *
from .disk import *
from .general import *
@@ -40,8 +39,8 @@ class Installer():
:type hostname: str, optional
"""
- def __init__(self, target, *, base_packages='base base-devel linux linux-firmware', kernels='linux'):
- base_packages = base_packages + kernels.replace(',', ' ')
+ def __init__(self, target, *, base_packages='base base-devel linux-firmware', kernels='linux'):
+ kernels = kernels.split(",")
self.target = target
self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
self.milliseconds = int(str(time.time()).split('.')[1])
@@ -52,6 +51,8 @@ class Installer():
}
self.base_packages = base_packages.split(' ') if type(base_packages) is str else base_packages
+ for kernel in kernels:
+ self.base_packages.append(kernel)
if hasUEFI():
self.base_packages.append("efibootmgr")
else:
@@ -363,8 +364,10 @@ class Installer():
boot_partition = partition
elif partition.mountpoint == self.target:
root_partition = partition
-
- self.log(f'Adding bootloader {bootloader} to {boot_partition}', level=logging.INFO)
+ if hasUEFI():
+ self.log(f'Adding bootloader {bootloader} to {boot_partition}', level=logging.INFO)
+ else:
+ self.log(f'Adding bootloader {bootloader} to {root_partition}', level=logging.INFO)
if bootloader == 'systemd-bootctl':
if not hasUEFI():
@@ -439,6 +442,7 @@ class Installer():
root_device = f"{root_partition.path}"
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.target} grub-install --target=i386-pc /dev/{root_device}'))
sys_command('/usr/bin/arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg')
+ self.helper_flags['bootloader'] = bootloader
return True
else:
raise RequirementError(f"Unknown (or not yet implemented) bootloader requested: {bootloader}")