s390x: skip grub.cfg #706
s390x: skip grub.cfg #706
Conversation
Grub is not used on s390x architecture Backport of: coreos#706 Signed-off-by: Alice Frosi <[email protected]>
|
This fixes an error, but I don't think it'll be sufficient to make gf-platformid work right now. Won't we need to run zipl to regen the bootloader config until we get two stage bootloading working? |
|
@ajeddeloh we need to rerun zipl during firstboot to remove the ignition kargs. We're setting the ignition arg during build (see https://github.com/tuan-hoang1/coreos-assembler/blob/7542ca45cf9007d9d0dbf91b340b6650574afaee/src/create_disk.sh#L141 part of Tuan's PR). We plan to add that part in ignition-dracut. Without coreOS is always booted in firstboot mode |
Grub is not used on s390x architecture Backport of: coreos#706 Signed-off-by: Alice Frosi <[email protected]>
Grub is not used on s390x architecture Backport of: coreos#706 Signed-off-by: Alice Frosi <[email protected]>
This looks kind of like what I suggested we do for all architectures. @ajeddeloh @alicefr could I get you to comment over there? |
src/gf-platformid
Outdated
| @@ -41,7 +41,7 @@ coreos_gf_run_mount "${tmp_dest}" | |||
| # * grub config | |||
| # * BLS config (for subsequent config regeneration) | |||
| # First, the grub config. | |||
| if [ "$arch" != "x86_64" ]; then | |||
| if [ "$arch" != "x86_64" ] && [ "$arch" != "s390x" ]; then | |||
There was a problem hiding this comment.
It would be great if we explained in the comment above why we don't need to do this on these two platforms
There was a problem hiding this comment.
actually arm should be in this list too since we landed anaconda-less arm.
There was a problem hiding this comment.
@ajeddeloh should I add arm too? I don't have the possibility to test it on arm
There was a problem hiding this comment.
@ajeddeloh so I guess, I can simply state if arch == ppc64le. Is it still required for power because they use anaconda?
There was a problem hiding this comment.
Right. On non-anaconda the grub config uses BLS and thus doesn't have the entries in the grub config, which is what this path is handling. The anaconda path is doing a more traditional grub2-mkconfig.
$arch == ppc64le sgtm.
@dustymabe on s390x every time you want to overwrite the kernel param you need to rerun zipl. So I think s390x needs always to be handled in a special way. |
Set grub.cfg only for ppc64le (using anaconda) Signed-off-by: Alice Frosi <[email protected]>
|
This LGTM as is - an improvement though we can make later (or now) is to have a centralized bit in |
|
(But eh, it's not like new architectures come along frequently, we're just slightly optimizing I guess for the person who will try to add RISC-V) |
Grub is not used on s390x architecture
Signed-off-by: Alice Frosi [email protected]