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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

baseimage: Add kernel-install integration #1018

Merged
merged 1 commit into from
Jan 13, 2025

Conversation

jmarrero
Copy link
Member

@jmarrero jmarrero commented Jan 9, 2025

Copy link
Collaborator

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

The base directory is for things that are truly hard requirements and also currently has some special handling at install time (see the Makefile...it's hacky).

For people who are making "sealed" images, they don't actually need to ship kernel-install in their images - i.e. for users who don't want to support having their images be used for derivation, they don't need it.

We do have the dracut directory, which this is related to but there are people using other initramfs generators too.

Logically this is configuration for systemd (of which kernel-install is a part).

Maybe what would make the most sense is to create a new systemd directory which configures/tweaks things shipped by systemd.

That'd be a great place to put the systemd journal persistence config too.

@jmarrero jmarrero force-pushed the baseimage-kernel branch 2 times, most recently from 57ac0ea to 498b0be Compare January 10, 2025 00:47
@jmarrero
Copy link
Member Author

I will add the journal one in a separate PR with its corresponding MR for the base image removing it there. Just to keep things separate.

@cgwalters
Copy link
Collaborator

Looks sane to me, I think we just need an update to the README.md

@jmarrero jmarrero force-pushed the baseimage-kernel branch 4 times, most recently from 43053f9 to 650a2d9 Compare January 10, 2025 01:17
@jmarrero
Copy link
Member Author

ok, I added the changes to the Makefile too following what we do for Dracut, but the question is, if that should be behind some flag since it's technically optional? Or maybe I misunderstood about needing to add this to the Makefile.

@cgwalters
Copy link
Collaborator

Note that everything in the baseimage directory is installed into /usr/share/doc/bootc - so it's just informative. It's up to base image builders to copy it in explicitly (and we aren't yet doing that in fedora-bootc at all yet).

So this can't break anything today. The changes LGTM as is!

Added a kernel-install configuration that enables
the rpm-ostree integration.

The second configuration file sets the Journal to persistent
as on bootc systems /var is empty by default and systemd
by default enables persistent journaling on the presence of
/var/log/journal.

Signed-off-by: Joseph Marrero Corchado <[email protected]>
@jmarrero
Copy link
Member Author

Ok, cool, I re-read the Makefile as you were typing :D and noticed the doc, but that makes sense now I will leave this PR alone then.

jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Jan 10, 2025
jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Jan 10, 2025
jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Jan 10, 2025
jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Jan 10, 2025
jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Jan 10, 2025
jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Jan 10, 2025
jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Jan 11, 2025
jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Jan 11, 2025
@jmarrero jmarrero marked this pull request as ready for review January 13, 2025 15:33
@jmarrero
Copy link
Member Author

Since this is informational at the moment, we should be good to merge this here.

@cgwalters cgwalters merged commit debd738 into containers:main Jan 13, 2025
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants