RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not create BLS and Limine entries for fallback initramfs (#3949) 

* Do not create BLS and Limine entries for fallback initramfs

Fallback initramfs seem to no longer be built by default.

* Remove initramfs variant logic altogether
This commit is contained in:
Mintsuki 2025-11-29 01:00:43 +01:00 committed by GitHub
parent b751ad5dab
commit 70a6c3499a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
archinstall/lib/installer.py
View File

@ -1160,19 +1160,18 @@ class Installer:
f"""\ f"""\
# Created by: archinstall # Created by: archinstall
# Created on: {self.init_time} # Created on: {self.init_time}
title Arch Linux ({{kernel}}{{variant}}) title Arch Linux ({{kernel}})
linux /vmlinuz-{{kernel}} linux /vmlinuz-{{kernel}}
initrd /initramfs-{{kernel}}{{variant}}.img initrd /initramfs-{{kernel}}.img
options {' '.join(self._get_kernel_params(root))} options {' '.join(self._get_kernel_params(root))}
""", """,
) )
for kernel in self.kernels: for kernel in self.kernels:
for variant in ('', '-fallback'): # Setup the loader entry
# Setup the loader entry name = entry_name.format(kernel=kernel)
name = entry_name.format(kernel=kernel, variant=variant) entry_conf = entries_dir / name
entry_conf = entries_dir / name entry_conf.write_text(entry_template.format(kernel=kernel))
entry_conf.write_text(entry_template.format(kernel=kernel, variant=variant))
def _add_systemd_bootloader( def _add_systemd_bootloader(
self, self,
@ -1237,8 +1236,8 @@ class Installer:
if uki_enabled: if uki_enabled:
default_entry = f'arch-{default_kernel}.efi' default_entry = f'arch-{default_kernel}.efi'
else: else:
entry_name = self.init_time + '_{kernel}{variant}.conf' entry_name = self.init_time + '_{kernel}.conf'
default_entry = entry_name.format(kernel=default_kernel, variant='') default_entry = entry_name.format(kernel=default_kernel)
self._create_bls_entries(boot_partition, root, entry_name) self._create_bls_entries(boot_partition, root, entry_name)
default = f'default {default_entry}' default = f'default {default_entry}'
@ -1496,15 +1495,14 @@ class Installer:
config_contents += f'\n/Arch Linux ({kernel})\n' config_contents += f'\n/Arch Linux ({kernel})\n'
config_contents += '\n'.join([f' {it}' for it in entry]) + '\n' config_contents += '\n'.join([f' {it}' for it in entry]) + '\n'
else: else:
for variant in ('', '-fallback'): entry = [
entry = [ 'protocol: linux',
'protocol: linux', f'path: {path_root}:/vmlinuz-{kernel}',
f'path: {path_root}:/vmlinuz-{kernel}', f'cmdline: {kernel_params}',
f'cmdline: {kernel_params}', f'module_path: {path_root}:/initramfs-{kernel}.img',
f'module_path: {path_root}:/initramfs-{kernel}{variant}.img', ]
] config_contents += f'\n/Arch Linux ({kernel})\n'
config_contents += f'\n/Arch Linux ({kernel}{variant})\n' config_contents += '\n'.join([f' {it}' for it in entry]) + '\n'
config_contents += '\n'.join([f' {it}' for it in entry]) + '\n'
config_path.write_text(config_contents) config_path.write_text(config_contents)