Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/installer.py
diff options
context:
space:
mode:
authorcodefiles <11915375+codefiles@users.noreply.github.com>2023-12-01 09:59:44 -0500
committerGitHub <noreply@github.com>2023-12-01 15:59:44 +0100
commit5db4456dba9f8c85ff70e545fa5bb3d6a37bd265 (patch)
tree177f4d5f8f369f180edeace344b5c4fe4055329f /archinstall/lib/installer.py
parent2aeb1b5762cce5646515f213b366b71367c1dc17 (diff)
Restrict UKI to supported options (#2280)
Diffstat (limited to 'archinstall/lib/installer.py')
-rw-r--r--archinstall/lib/installer.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index d39eb922..ccae8faa 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -907,19 +907,17 @@ class Installer:
self,
boot_partition: disk.PartitionModification,
root_partition: disk.PartitionModification,
- efi_partition: Optional[disk.PartitionModification],
- uki_enabled: bool = False
+ efi_partition: Optional[disk.PartitionModification]
):
self.pacman.strap('grub') # no need?
- if not uki_enabled:
- grub_default = self.target / 'etc/default/grub'
- config = grub_default.read_text()
+ grub_default = self.target / 'etc/default/grub'
+ config = grub_default.read_text()
- kernel_parameters = ' '.join(self._get_kernel_params(root_partition, False, False))
- config = re.sub(r'(GRUB_CMDLINE_LINUX=")("\n)', rf'\1{kernel_parameters}\2', config, 1)
+ kernel_parameters = ' '.join(self._get_kernel_params(root_partition, False, False))
+ config = re.sub(r'(GRUB_CMDLINE_LINUX=")("\n)', rf'\1{kernel_parameters}\2', config, 1)
- grub_default.write_text(config)
+ grub_default.write_text(config)
info(f"GRUB boot partition: {boot_partition.dev_path}")
@@ -1234,7 +1232,7 @@ Exec = /bin/sh -c "{hook_command}"
case Bootloader.Systemd:
self._add_systemd_bootloader(boot_partition, root_partition, efi_partition, uki_enabled)
case Bootloader.Grub:
- self._add_grub_bootloader(boot_partition, root_partition, efi_partition, uki_enabled)
+ self._add_grub_bootloader(boot_partition, root_partition, efi_partition)
case Bootloader.Efistub:
self._add_efistub_bootloader(boot_partition, root_partition, uki_enabled)
case Bootloader.Limine: