From 931f47a037d7456adf9e9de9452b6b59c39a7b7a Mon Sep 17 00:00:00 2001
From: mintsuki <36459316+mintsuki@users.noreply.github.com>
Date: Thu, 20 Mar 2025 22:35:32 +0100
Subject: [PATCH] Limine: use UUID for accessing boot partition if not same as
 ESP (#3267)

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

diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 31440f01..1343dd0e 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -1349,6 +1349,10 @@ Exec = /bin/sh -c "{hook_command}"
 		kernel_params = ' '.join(self._get_kernel_params(root))
 		config_contents = 'timeout: 5\n'
 
+		path_root = 'boot()'
+		if efi_partition and boot_partition != efi_partition:
+			path_root = f'uuid({boot_partition.partuuid})'
+
 		for kernel in self.kernels:
 			for variant in ('', '-fallback'):
 				if uki_enabled:
@@ -1360,9 +1364,9 @@ Exec = /bin/sh -c "{hook_command}"
 				else:
 					entry = [
 						'protocol: linux',
-						f'path: boot():/vmlinuz-{kernel}',
+						f'path: {path_root}:/vmlinuz-{kernel}',
 						f'cmdline: {kernel_params}',
-						f'module_path: boot():/initramfs-{kernel}{variant}.img',
+						f'module_path: {path_root}:/initramfs-{kernel}{variant}.img',
 					]
 
 				config_contents += f'\n/Arch Linux ({kernel}{variant})\n'