testiso: Fix iso-install and iso-live-login for ppc64le#1466
testiso: Fix iso-install and iso-live-login for ppc64le#1466openshift-merge-robot merged 1 commit intocoreos:masterfrom
Conversation
| # grub2-mkrescue is a wrapper around xorriso | ||
| genisoargs = ['grub2-mkrescue'] | ||
| genisoargs = ['grub2-mkrescue', | ||
| '-volid', volid] |
There was a problem hiding this comment.
A nit so minor might be classified by physicists as having no mass:
Why the line break?
There was a problem hiding this comment.
looking at other places where genisoargs are defined with arguments being in a separate line, i wanted to keep things in line with that, but sure..i can do away with the line break
There was a problem hiding this comment.
Not a big deal, I'll give you a break on this one
There was a problem hiding this comment.
done. had to make changes anyway.
| // selected. This allows us to have "boot once" functionality on both UEFI | ||
| // and BIOS (`-boot once=d` OTOH doesn't work with OVMF). | ||
| builder.Append("-drive", "file="+path+",format=raw,if=none,readonly=on,id=installiso", "-device", "ide-cd,drive=installiso,bootindex=2") | ||
| builder.Append("-cdrom", path) |
There was a problem hiding this comment.
But we need the bootindex bits here right? I think we need instead to have arch-dependent devices for cdrom or so.
There was a problem hiding this comment.
i thought the primary purpose of setting bootindex to 2 was to make sure that this device does not get picked first on a reboot. With the -cdrom option, it always first defaults to the primary disk anyway, so i thought that not necessary.
There was a problem hiding this comment.
See #1312
and it's notable that this PR is failing in the 4k sector test which is using UEFI. It might be that we're doing CDROM first on UEFI or something?
There was a problem hiding this comment.
ah..thanks for that context...yes uefi breaks with this change..it doesn't even recognize that cdrom as bootable.i'll dig in more or we might need to have two paths - one for uefi and one for bios
There was a problem hiding this comment.
just made cdrom specific to s390x/ppc64le as those don't support uefi anyway.
Prashanth684
force-pushed
the
testiso-ppc64le
branch
from
fc3d99c to
c31caf0
Compare
| // primary disk is selected. This allows us to have "boot once" functionality on | ||
| // both UEFI and BIOS (`-boot once=d` OTOH doesn't work with OVMF). | ||
| switch system.RpmArch() { | ||
| case "s390x", "ppc64le": |
There was a problem hiding this comment.
Could you please add aarch64. too. It seems to have the same issue.
qemu-system-aarch64: -device ide-cd,drive=installiso,bootindex=2: No 'IDE' bus found for device 'ide-cd'
There was a problem hiding this comment.
i did add it, but like we discussed cdrom will not work either. I'd like to get this in now so we can get the rhcos pipeline going for ppc64le
Prashanth684
force-pushed
the
testiso-ppc64le
branch
from
c31caf0 to
a75be18
Compare
Few fixes to get the iso-install case working for ppc64le - add volid to grub2-mkrescue command - use -cdrom instead of ide-cd as ide-cd is not supported on ppc64le/s390x. It achieves the same effect as what was done using the ide-cd device. Closes: coreos#1463
Prashanth684
force-pushed
the
testiso-ppc64le
branch
from
a75be18 to
2515886
Compare
|
lgtm please? |
|
Thanks for this! I hope that by switching to QMP later on we can clean this up. |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, Prashanth684 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
5 participants
Few fixes to get the iso-install case working for ppc64le
what was done using the ide-cd device.
Closes: #1463