From 613bec6562c4d67c4c93d443e6d7e93fdb41ba66 Mon Sep 17 00:00:00 2001
From: codefiles <11915375+codefiles@users.noreply.github.com>
Date: Mon, 11 Mar 2024 14:38:10 -0400
Subject: Fix GRUB boot directory (#2408)

---
 archinstall/lib/installer.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'archinstall/lib')

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',
-- 
cgit v1.2.3-70-g09d2