use bootConfig.ukiEfiStubBinaryPath in buildUki

SeanDougherty · SeanDougherty · commit 4a9c3624d419 · 2025-08-06T21:10:12.000Z
diff --git a/toolkit/tools/pkg/imagecustomizerlib/customizeuki.go b/toolkit/tools/pkg/imagecustomizerlib/customizeuki.go
@@ -347,7 +347,6 @@ func createUki(ctx context.Context, uki *imagecustomizerapi.Uki, buildDir string
 	defer bootPartitionMount.Close()
 
 	osSubreleaseFullPath := filepath.Join(buildDir, UkiBuildDir, "os-release")
-	stubPath := filepath.Join(buildDir, UkiBuildDir, bootConfig.ukiEfiStubBinary)
 	cmdlineFilePath := filepath.Join(buildDir, UkiBuildDir, KernelCmdlineArgsJson)
 
 	// Get mapped kernels and initramfs.
@@ -357,7 +356,7 @@ func createUki(ctx context.Context, uki *imagecustomizerapi.Uki, buildDir string
 	}
 
 	for kernel, initramfs := range kernelToInitramfs {
-		err := buildUki(kernel, initramfs, cmdlineFilePath, osSubreleaseFullPath, stubPath, buildDir,
+		err := buildUki(kernel, initramfs, cmdlineFilePath, osSubreleaseFullPath, bootConfig.ukiEfiStubBinaryPath, buildDir,
 			systemBootPartitionTmpDir,
 		)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,6 @@ func createUki(ctx context.Context, uki *imagecustomizerapi.Uki, buildDir string`
`347`	`347`	`defer bootPartitionMount.Close()`
`348`	`348`
`349`	`349`	`osSubreleaseFullPath := filepath.Join(buildDir, UkiBuildDir, "os-release")`
`350`		`- stubPath := filepath.Join(buildDir, UkiBuildDir, bootConfig.ukiEfiStubBinary)`
`351`	`350`	`cmdlineFilePath := filepath.Join(buildDir, UkiBuildDir, KernelCmdlineArgsJson)`
`352`	`351`
`353`	`352`	`// Get mapped kernels and initramfs.`
`@@ -357,7 +356,7 @@ func createUki(ctx context.Context, uki *imagecustomizerapi.Uki, buildDir string`
`357`	`356`	`}`
`358`	`357`
`359`	`358`	`for kernel, initramfs := range kernelToInitramfs {`
`360`		`- err := buildUki(kernel, initramfs, cmdlineFilePath, osSubreleaseFullPath, stubPath, buildDir,`
	`359`	`+ err := buildUki(kernel, initramfs, cmdlineFilePath, osSubreleaseFullPath, bootConfig.ukiEfiStubBinaryPath, buildDir,`
`361`	`360`	`systemBootPartitionTmpDir,`
`362`	`361`	`)`
`363`	`362`	`if err != nil {`