Skip to content

Prepwork for #2200#2240

Merged
Johan-Liebert1 merged 3 commits into
bootc-dev:mainfrom
Johan-Liebert1:uki-cleanup-prep
Jun 11, 2026
Merged

Prepwork for #2200#2240
Johan-Liebert1 merged 3 commits into
bootc-dev:mainfrom
Johan-Liebert1:uki-cleanup-prep

Conversation

@Johan-Liebert1

Copy link
Copy Markdown
Collaborator

ukify: Allow passing path to kernel and initramfs

While building a sealed UKI image we'd want to remove the original
kernel + initramfs from the final image and have only the final UKI
present. This was not possible before as bootc container ukify
expected kernel + initramfs to be present in usr/lib/modules of
container root

We now accept a parameter kernel_dir which must be of the format
/path/$kernel_ver for bootc container ukify

Fixes: #2185


test/tmt: Don't run bootloader-none test for composefs

Bootloader set to none is not supported with the composefs backend so we
skip tests with this option for composefs backend


image-proxy: Use privileged user when pull from containers storage

We were defaulting to unprivileged user "nobody" when pulling an image,
but pulling from containers-storage was failing as it requires extra
privileges. Default to the current user, usually root, when pulling from
containers-storage

While building a sealed UKI image we'd want to remove the original
kernel + initramfs from the final image and have only the final UKI
present. This was not possible before as `bootc container ukify`
expected kernel + initramfs to be present in `usr/lib/modules` of
container root

We now accept a parameter `kernel_dir` which must be of the format
`/path/$kernel_ver` for `bootc container ukify`

Fixes: bootc-dev#2185

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Bootloader set to none is not supported with the composefs backend so we
skip tests with this option for composefs backend

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
We were defaulting to unprivileged user "nobody" when pulling an image,
but pulling from containers-storage was failing as it requires extra
privileges. Default to the current user, usually root, when pulling from
containers-storage

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
@Johan-Liebert1 Johan-Liebert1 requested a review from cgwalters June 9, 2026 03:18
@Johan-Liebert1 Johan-Liebert1 added the ci/tier-1 Run CI for tier-1 OS (centos-10) only label Jun 9, 2026
@github-actions github-actions Bot added area/install Issues related to `bootc install` area/ostree Issues related to ostree area/documentation Updates to the documentation labels Jun 9, 2026
@bootc-bot bootc-bot Bot requested a review from jeckersb June 9, 2026 03:18
@Johan-Liebert1 Johan-Liebert1 mentioned this pull request Jun 9, 2026
@cgwalters cgwalters enabled auto-merge June 9, 2026 15:23
@cgwalters cgwalters added this pull request to the merge queue Jun 9, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 9, 2026
@Johan-Liebert1 Johan-Liebert1 added this pull request to the merge queue Jun 10, 2026
Comment thread crates/lib/src/cli.rs
#[clap(long)]
write_dumpfile_to: Option<Utf8PathBuf>,

/// The directory containing the kernel and initramfs.img

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
/// The directory containing the kernel and initramfs.img
/// The directory containing the kernel and initramfs.img.

Comment thread crates/lib/src/cli.rs
write_dumpfile_to: Option<Utf8PathBuf>,

/// The directory containing the kernel and initramfs.img
/// Must be of the format /parent/$kernel_version

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe?

Suggested change
/// Must be of the format /parent/$kernel_version
/// Must be of the format `/parent/$kernel_version`.


setenforce 0

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change

@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 10, 2026
@Johan-Liebert1 Johan-Liebert1 added this pull request to the merge queue Jun 10, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 10, 2026
@Johan-Liebert1 Johan-Liebert1 added this pull request to the merge queue Jun 11, 2026
@Johan-Liebert1 Johan-Liebert1 removed this pull request from the merge queue due to a manual request Jun 11, 2026
@Johan-Liebert1 Johan-Liebert1 added this pull request to the merge queue Jun 11, 2026
Merged via the queue into bootc-dev:main with commit c818e03 Jun 11, 2026
71 of 86 checks passed
@Johan-Liebert1 Johan-Liebert1 deleted the uki-cleanup-prep branch June 11, 2026 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/documentation Updates to the documentation area/install Issues related to `bootc install` area/ostree Issues related to ostree ci/tier-1 Run CI for tier-1 OS (centos-10) only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Rework UKI generation to enable removing kernel & initrd from image

3 participants