Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodefiles <11915375+codefiles@users.noreply.github.com>2024-03-11 14:38:10 -0400
committerGitHub <noreply@github.com>2024-03-11 19:38:10 +0100
commit613bec6562c4d67c4c93d443e6d7e93fdb41ba66 (patch)
tree6d9e30f154927c1e423a07eee45a4eb938782429
parentc210cdcb8f0883ac13a6ee22aebb8f01f3043e09 (diff)
Fix GRUB boot directory (#2408)
-rw-r--r--archinstall/lib/installer.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index c53e922d..37121118 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -919,12 +919,7 @@ class Installer:
info(f"GRUB boot partition: {boot_partition.dev_path}")
- if boot_partition == root_partition and root_partition.mountpoint:
- boot_dir = root_partition.mountpoint / 'boot'
- elif boot_partition.mountpoint:
- boot_dir = boot_partition.mountpoint
- else:
- raise ValueError('Could not detect boot directory')
+ boot_dir = Path('/boot')
command = [
'/usr/bin/arch-chroot',
@@ -942,8 +937,9 @@ class Installer:
self.pacman.strap('efibootmgr') # TODO: Do we need? Yes, but remove from minimal_installation() instead?
boot_dir_arg = []
- if boot_partition != efi_partition:
- boot_dir_arg.append(f'--boot-directory={boot_dir}')
+ if boot_partition.mountpoint and boot_partition.mountpoint != boot_dir:
+ boot_dir_arg.append(f'--boot-directory={boot_partition.mountpoint}')
+ boot_dir = boot_partition.mountpoint
add_options = [
'--target=x86_64-efi',