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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support booting Fedora default image on s390x #2183

Merged
merged 6 commits into from
Dec 16, 2023

Conversation

DaanDeMeyer
Copy link
Contributor

No description provided.

Copy link
Contributor

@behrmann behrmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable, but there should maybe be a separate tests for whether single und multiple match sections work as expected so we don't regress there in the future.

mkosi/__init__.py Outdated Show resolved Hide resolved
mkosi/architecture.py Show resolved Hide resolved
If building a bootable image is not explicitly disabled and we
don't split out an initrd from a UKI because the dependencies are
not installed or we're on the wrong architecture, let's still build
an initrd so that booting with qemu direct kernel boot still works.
Instead of considering all match sections part of the same match,
let's consider each [Match] section on its own. This allows doing
multiple independent triggers, such as:

"""
[Match]
Format=|disk
Format=|directory

[Match]
Architecture=|x86-64
Architecture=|arm64
"""

Which now means to match if the format is one of disk or directory
and the architecture is one of x86-64 or arm64.
If qemu fails to start then virtiofsd won't shut down on its own
so let's explicitly send it a signal to shut down.
For testing purposes we might want to override these.
@huoqifeng
Copy link

@DaanDeMeyer sorry for bothering you in a closed PR, I think this PR is to enable an image on s390x and make it launched via qemu? May I know an example mkosi.conf that worked?

@DaanDeMeyer
Copy link
Contributor Author

@huoqifeng You should be able to use the mkosi configuration from the mkosi repository itself as an example. If I run "mkosi -d fedora --architecture s390x -f qemu" in the mkosi repository, that will boot with virtiofs into a qemu VM running s390.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants