Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions archinstall/lib/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1160,19 +1160,18 @@ def _create_bls_entries(
f"""\
# Created by: archinstall
# Created on: {self.init_time}
title Arch Linux ({{kernel}}{{variant}})
title Arch Linux ({{kernel}})
linux /vmlinuz-{{kernel}}
initrd /initramfs-{{kernel}}{{variant}}.img
initrd /initramfs-{{kernel}}.img
options {' '.join(self._get_kernel_params(root))}
""",
)

for kernel in self.kernels:
for variant in ('', '-fallback'):
# Setup the loader entry
name = entry_name.format(kernel=kernel, variant=variant)
entry_conf = entries_dir / name
entry_conf.write_text(entry_template.format(kernel=kernel, variant=variant))
# Setup the loader entry
name = entry_name.format(kernel=kernel)
entry_conf = entries_dir / name
entry_conf.write_text(entry_template.format(kernel=kernel))

def _add_systemd_bootloader(
self,
Expand Down Expand Up @@ -1237,8 +1236,8 @@ def _add_systemd_bootloader(
if uki_enabled:
default_entry = f'arch-{default_kernel}.efi'
else:
entry_name = self.init_time + '_{kernel}{variant}.conf'
default_entry = entry_name.format(kernel=default_kernel, variant='')
entry_name = self.init_time + '_{kernel}.conf'
default_entry = entry_name.format(kernel=default_kernel)
self._create_bls_entries(boot_partition, root, entry_name)

default = f'default {default_entry}'
Expand Down Expand Up @@ -1496,15 +1495,14 @@ def _add_limine_bootloader(
config_contents += f'\n/Arch Linux ({kernel})\n'
config_contents += '\n'.join([f' {it}' for it in entry]) + '\n'
else:
for variant in ('', '-fallback'):
entry = [
'protocol: linux',
f'path: {path_root}:/vmlinuz-{kernel}',
f'cmdline: {kernel_params}',
f'module_path: {path_root}:/initramfs-{kernel}{variant}.img',
]
config_contents += f'\n/Arch Linux ({kernel}{variant})\n'
config_contents += '\n'.join([f' {it}' for it in entry]) + '\n'
entry = [
'protocol: linux',
f'path: {path_root}:/vmlinuz-{kernel}',
f'cmdline: {kernel_params}',
f'module_path: {path_root}:/initramfs-{kernel}.img',
]
config_contents += f'\n/Arch Linux ({kernel})\n'
config_contents += '\n'.join([f' {it}' for it in entry]) + '\n'

config_path.write_text(config_contents)

Expand Down