Simplify and improve flatcar_production_qemu*.sh script#2846
Merged
Conversation
There's no need to differentiate between amd64 and arm64 boards here any more. This also adds bootindex=1 option to the -device flag, so we can pass more secondary disks without affecting the boot order.
The final part of the script differed only the name of the qemu binary to execute and in network device driver (virtio-net-pci on amd64 vs virtio-net-device on arm64). virtio-net-pci seems to be working also on arm64, so simplify the code to avoid repetition.
Member
Author
|
Thanks! Merging it - no point in running the CI, as no parts of CI are using the script. |
|
Build action triggered: https://github.com/flatcar/scripts/actions/runs/14639292341 |
Contributor
|
Maybe we could add a changelog entry in the |
Member
Author
Good idea, will file a follow-up. |
Member
Author
|
Filed here: #2847 |
Contributor
|
I've actually just run an NVIDIA sysext build based on main (including this PR) and the vms job failed with Do you think this could be related? |
Contributor
|
It is. See #2848. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
How disk and network devices are set up for the machine need not to be arch-specific any more. We can use virtio-blk-pci and virtio-net-pci on both arches.
This PR also adds two options:
-Dor-image-disk-optsfor adding options to primary disk (I used it mostly to add "serial=foo", so primary disk is available under/dev/disk/by-id/virtio-fooand its partitions as/dev/disk/by-id/virtio-foo-partN)-dor-diskfor adding extra disks - you can doqemu-img create -f qcow2 extradisk 1G, and then invoke the script with-d extradisk,serial=my-extra-diskto have it available under/dev/disk/by-id/virtio-my-extra-diskTested locally on both amd64 and arm64.