Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix initrd and kernel ISO paths #1869

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Fix initrd and kernel ISO paths #1869

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,10 @@ func ISOLoaderPath(arch string) string {

// ISOKernelPath returns path use to store the kernel
func ISOKernelPath(arch string) string {
return ISOLoaderPath(arch) + "linux"
return filepath.Join(ISOLoaderPath(arch), "linux")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ldevulder note the arch is passed as an argument instead of using runtime architecture to enable cross arch builds. We might be looking to build arm64 images in a x86_64 host, I think we are so close to make that possible.

}

// ISOInitrdPath returns path use to store the initramfs
func ISOInitrdPath(arch string) string {
return ISOLoaderPath(arch) + "initrd"
return filepath.Join(ISOLoaderPath(arch), "initrd")
}