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.

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

Fix initrd and kernel ISO paths #1869

Merged

Conversation

davidcassany
Copy link
Contributor

@davidcassany davidcassany commented Dec 1, 2023

This changes the kernel path from /boot/<arch>/loaderlinux to /boot/<arch>/loader/linux. An equivalent change is applied on initrd path.

Signed-off-by: David Cassany <dcassany@suse.com>
@davidcassany davidcassany added the kind/bug Something isn't working label Dec 1, 2023
@davidcassany davidcassany requested a review from a team as a code owner December 1, 2023 12:03
@@ -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.

@davidcassany davidcassany enabled auto-merge (rebase) December 1, 2023 12:06
@davidcassany davidcassany merged commit 0aa60f4 into rancher:main Dec 1, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Something isn't working
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants