Fixes #36847 - Use initrd variable for Debian ipxe #10156
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
evgeni
reviewed
May 10, 2024
| @@ -36,7 +36,7 @@ ping --count 1 ${netX/dns} || echo Ping to DNS failed or ping command not availa | |||
| <% kernel = boot_files_uris[0] -%> | |||
| <% initrd = boot_files_uris[1] -%> | |||
|
|
|||
| kernel <%= kernel %> initrd=initrd.img interface=auto url=<%= url %> ramdisk_size=10800 root=/dev/rd/0 rw auto <%= snippet("preseed_kernel_options", variables: {ipxe_net: true}).strip %> | |||
| kernel <%= kernel %> initrd=<%= initrd %> interface=auto url=<%= url %> ramdisk_size=10800 root=/dev/rd/0 rw auto <%= snippet("preseed_kernel_options", variables: {ipxe_net: true}).strip %> | |||
There was a problem hiding this comment.
looking at the snapshot failures, this should be something like basename(initrd) (if such a thing exists)?
There was a problem hiding this comment.
The same functionality can be used here, too
Previously the filename was hardcoded, but the OS layer actually provides this filename as a variable. This should match the actual filename on mirrors. The variables are already present in the environment, which means the manual calculation can be removed.
ekohl
force-pushed
the
36847-rename_initrd
branch
from
f0c5526
to
8d31dcc
Compare
|
This got a bit bigger, but I think this ends up cleaning it up nicely. |
sbernhard
reviewed
May 13, 2024
| <% subnet = @host.subnet -%> | ||
| <% if subnet.respond_to?(:dhcp_boot_mode?) && subnet.dhcp_boot_mode? -%> | ||
| kernel <%= kernel %> initrd=initrd.img splash=silent install=<%= medium_uri %> autoyast=<%= foreman_url('provision') %> text-mode=1 useDHCP=1 <%= extra_args.join(' ')%> | ||
| kernel <%= @kernel_uri %> initrd=<%= @initrd_uri.split('/').last %> splash=silent install=<%= medium_uri %> autoyast=<%= foreman_url('provision') %> text-mode=1 useDHCP=1 <%= extra_args.join(' ')%> |
There was a problem hiding this comment.
Overall, pretty cool cleanup!
I would prefer to have a method which returns @initrd_file and can be used in the various locations
There was a problem hiding this comment.
Makes sense. I wasn't allowed to use File.basename but given the repetition I don't think that woud have been pretty anyway
There was a problem hiding this comment.
would be nice to have this including the new initrd_file method.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously the filename was hardcoded, but the OS layer actually provides this filename as a variable. This should match the actual filename on mirrors.