From 2aeb1b5762cce5646515f213b366b71367c1dc17 Mon Sep 17 00:00:00 2001
From: codefiles <11915375+codefiles@users.noreply.github.com>
Date: Fri, 1 Dec 2023 08:32:08 -0500
Subject: Minor fixes for UKI (#2279)

---
 archinstall/lib/installer.py | 13 ++++++-------
 schema.json                  |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index ca195688..d39eb922 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -694,7 +694,7 @@ class Installer:
 		SysCommand(f'/usr/bin/arch-chroot {self.target} chmod 700 /root')
 
 		if mkinitcpio and not self.mkinitcpio(['-P']):
-			error(f"Error generating initramfs (continuing anyway)")
+			error('Error generating initramfs (continuing anyway)')
 
 		self.helper_flags['base'] = True
 
@@ -1157,11 +1157,10 @@ Exec = /bin/sh -c "{hook_command}"
 
 		ucode = self._get_microcode()
 
-		esp = efi_partition.mountpoint
-
 		diff_mountpoint = None
-		if esp != Path('/efi'):
-			diff_mountpoint = str(esp)
+
+		if efi_partition.mountpoint != Path('/efi'):
+			diff_mountpoint = str(efi_partition.mountpoint)
 
 		image_re = re.compile('(.+_image="/([^"]+).+\n)')
 		uki_re = re.compile('#((.+_uki=")/[^/]+(.+\n))')
@@ -1190,12 +1189,12 @@ Exec = /bin/sh -c "{hook_command}"
 			preset.write_text(''.join(config))
 
 		# Directory for the UKIs
-		uki_dir = self.target / esp.relative_to(Path('/')) / 'EFI/Linux'
+		uki_dir = self.target / efi_partition.relative_mountpoint / 'EFI/Linux'
 		uki_dir.mkdir(parents=True, exist_ok=True)
 
 		# Build the UKIs
 		if not self.mkinitcpio(['-P']):
-			error(f"Error generating initramfs (continuing anyway)")
+			error('Error generating initramfs (continuing anyway)')
 
 	def add_bootloader(self, bootloader: Bootloader, uki_enabled: bool = False):
 		"""
diff --git a/schema.json b/schema.json
index b1d45f64..74ecc4d3 100644
--- a/schema.json
+++ b/schema.json
@@ -36,7 +36,7 @@
             ]
         },
         "uki": {
-            "description": "Set to true to use a unified kernel images",
+            "description": "Set to true to use unified kernel images",
             "type": "boolean"
         },
         "custom-commands": {
-- 
cgit v1.2.3-54-g00ecf