Fix the UKI stub path on ARM64.

Author: cwize1

toolkit/tools/pkg/imagecustomizerlib/customizeuki.go

@@ -128,7 +128,7 @@ func prepareUki(ctx context.Context, buildDir string, uki *imagecustomizerapi.Uk
 	}
 
 	// Copy UKI-specific files such as kernel, initramfs, and UKI stub file.
-	err = copyUkiFiles(buildDir, kernelToInitramfs, imageChroot)
+	err = copyUkiFiles(buildDir, kernelToInitramfs, imageChroot, bootConfig)
 	if err != nil {
 		return fmt.Errorf("failed to copy UKI files:\n%w", err)
 	}
@@ -183,10 +183,12 @@ func createUkiDirectories(buildDir string, imageChroot *safechroot.Chroot) error
 	return nil
 }
 
-func copyUkiFiles(buildDir string, kernelToInitramfs map[string]string, imageChroot *safechroot.Chroot) error {
+func copyUkiFiles(buildDir string, kernelToInitramfs map[string]string, imageChroot *safechroot.Chroot,
+	bootConfig BootFilesArchConfig,
+) error {
 	filesToCopy := map[string]string{
-		filepath.Join(imageChroot.RootDir(), "/usr/lib/systemd/boot/efi/linuxx64.efi.stub"): filepath.Join(buildDir, UkiBuildDir, "linuxx64.efi.stub"),
-		filepath.Join(imageChroot.RootDir(), "/etc/os-release"):                             filepath.Join(buildDir, UkiBuildDir, "os-release"),
+		filepath.Join(imageChroot.RootDir(), bootConfig.ukiEfiStubBinaryPath): filepath.Join(buildDir, UkiBuildDir, bootConfig.ukiEfiStubBinary),
+		filepath.Join(imageChroot.RootDir(), "/etc/os-release"):               filepath.Join(buildDir, UkiBuildDir, "os-release"),
 	}
 
 	for kernel, initramfs := range kernelToInitramfs {

toolkit/tools/pkg/imagecustomizerlib/liveosisoutils.go

@@ -16,6 +16,7 @@ import (
 const (
 	osEspBootloaderDir = "/boot/efi/EFI/BOOT"
 	isoBootloaderDir   = "/efi/boot"
+	ukiEfiStubDir      = "/usr/lib/systemd/boot/efi/"
 
 	bootx64Binary  = "bootx64.efi"
 	bootAA64Binary = "bootaa64.efi"
@@ -29,6 +30,9 @@ const (
 	systemdBootx64Binary  = "systemd-bootx64.efi"
 	systemdBootAA64Binary = "systemd-bootaa64.efi"
 
+	ukiEfiStubx64Binary  = "linuxx64.efi.stub"
+	ukiEfiStubAA64Binary = "linuxaa64.efi.stub"
+
 	grubCfgDir     = "/boot/grub2"
 	isoGrubCfg     = "grub.cfg"
 	isoGrubCfgPath = grubCfgDir + "/" + isoGrubCfg
@@ -78,6 +82,8 @@ type BootFilesArchConfig struct {
 	osEspGrubNoPrefixBinaryPath string
 	isoBootBinaryPath           string
 	isoGrubBinaryPath           string
+	ukiEfiStubBinary            string
+	ukiEfiStubBinaryPath        string
 }
 
 var (
@@ -92,6 +98,8 @@ var (
 			osEspGrubNoPrefixBinaryPath: osEspBootloaderDir + "/" + grubx64NoPrefixBinary,
 			isoBootBinaryPath:           isoBootloaderDir + "/" + bootx64Binary,
 			isoGrubBinaryPath:           isoBootloaderDir + "/" + grubx64Binary,
+			ukiEfiStubBinary:            ukiEfiStubx64Binary,
+			ukiEfiStubBinaryPath:        ukiEfiStubDir + "/" + ukiEfiStubx64Binary,
 		},
 		"arm64": {
 			bootBinary:                  bootAA64Binary,
@@ -103,6 +111,8 @@ var (
 			osEspGrubNoPrefixBinaryPath: osEspBootloaderDir + "/" + grubAA64NoPrefixBinary,
 			isoBootBinaryPath:           isoBootloaderDir + "/" + bootAA64Binary,
 			isoGrubBinaryPath:           isoBootloaderDir + "/" + grubAA64Binary,
+			ukiEfiStubBinary:            ukiEfiStubAA64Binary,
+			ukiEfiStubBinaryPath:        ukiEfiStubDir + "/" + ukiEfiStubAA64Binary,
 		},
 	}
 )