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

sysroot: Support boot counting for boot entries #3310

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

igoropaniuk
Copy link

@igoropaniuk igoropaniuk commented Sep 19, 2024

Add support for boot counting for bootloader entries [1].
The boot counting data is stored in the name of the boot loader entry.
A boot loader entry file name may contain a plus (+) followed by a number.
This may optionally be followed by a minus (-) followed by a second number.
The dot (.) and file name suffix (conf or efi) must immediately follow.

The feature is enabled via sysroot configuration:
[sysroot]
boot-counting-tries=3

Testing:
$ ostree admin deploy 91fc19319be9e79d07159303dff125f40f10e5c25614630dcbed23d95e36f907
Copying /etc changes: 2 modified, 3 removed, 4 added
bootfs is sufficient for calculated new size: 0 bytes
Transaction complete; bootconfig swap: yes; bootversion: boot.0.1, deployment count change: 1

$ ls /boot/loader/entries
ostree-1.conf ostree-2+3.conf

[1] https://uapi-group.org/specifications/specs/boot_loader_specification/#boot-counting

Copy link

openshift-ci bot commented Sep 19, 2024

Hi @igoropaniuk. Thanks for your PR.

I'm waiting for a ostreedev member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@igoropaniuk
Copy link
Author

This PR was created for initial feedback, I'll address the naming in the tests if needed and re-push

@cgwalters
Copy link
Member

I love the idea of integrating here, thanks for starting this! This came up before in at least #3032

Hmm don't we need to consider how we make this configurable? Currently systemd kernel-install parses /etc/kernel/tries. (I think we should also support a /usr/lib variant of this, but that's mostly an aside). I guess we could in theory just start honoring that file too?

@igoropaniuk
Copy link
Author

igoropaniuk commented Sep 23, 2024

@cgwalters thanks for the feedback, my concern regarding parsing /etc/kernel/tries is that it's systemd-specific config, which is not described in https://uapi-group.org/specifications/specs/boot_loader_specification/

A can add an optional autoconf flag for that

@igoropaniuk
Copy link
Author

igoropaniuk commented Oct 16, 2024

@cgwalters added support for /etc/kernel/tries as suggested
I also wrapped the functionality with an autoconf flag (--enable-boot-count), which is disabled by default.

@igoropaniuk igoropaniuk changed the title [RFC] sysroot: Support boot counting for boot entries sysroot: Support boot counting for boot entries Oct 16, 2024
Copy link
Member

@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.

Thanks so much for working on this!

configure.ac Outdated Show resolved Hide resolved
src/libostree/ostree-sysroot-deploy.c Outdated Show resolved Hide resolved
@cgwalters
Copy link
Member

BTW, which bootloader are you looking at using this with?

@igoropaniuk
Copy link
Author

@cgwalters EDK2 + systemd-boot

@igoropaniuk
Copy link
Author

@cgwalters I've addressed all comments, thanks!

@igoropaniuk
Copy link
Author

@cgwalters looks like some CI tests are still failing, but all of them are unrelated to this change, for example:

2024-10-30T16:06:09.9538403Z ERROR: tests/test-commit-sign.sh - too few tests run (expected 7, got 2)
2024-10-30T16:06:09.9539247Z ERROR: tests/test-commit-sign.sh - exited with status 1

@igoropaniuk igoropaniuk requested a review from cgwalters October 31, 2024 13:50
@cgwalters
Copy link
Member

Yes CI failures are unrelated, will look at this soon

man/ostree.repo-config.xml Outdated Show resolved Hide resolved
man/ostree.repo-config.xml Outdated Show resolved Hide resolved
src/libostree/ostree-repo.c Show resolved Hide resolved
src/libostree/ostree-sysroot-deploy.c Show resolved Hide resolved
src/libostree/ostree-sysroot-deploy.c Outdated Show resolved Hide resolved
@igoropaniuk
Copy link
Author

The PR is not stalled, I'll get back to it tomorrow

@igoropaniuk igoropaniuk force-pushed the boot_count branch 2 times, most recently from 030b79c to 8802316 Compare December 4, 2024 22:16
@igoropaniuk igoropaniuk requested a review from jlebon December 4, 2024 22:18
@igoropaniuk
Copy link
Author

@jlebon @cgwalters all comments addressed, please take a look

@igoropaniuk igoropaniuk force-pushed the boot_count branch 2 times, most recently from 905317a to 9ab2679 Compare December 4, 2024 22:21
@igoropaniuk igoropaniuk force-pushed the boot_count branch 3 times, most recently from 37ba251 to 087e056 Compare December 5, 2024 21:15
Add support for boot counting for bootloader entries [1].
The boot counting data is stored in the name of the boot loader entry.
A boot loader entry file name may contain a plus (+) followed by a number.
This may optionally be followed by a minus (-) followed by a second number.
The dot (.) and file name suffix (conf or efi) must immediately follow.

The feature is enabled via sysroot configuration:
[sysroot]
boot-counting-tries=3

Testing:
$ ostree admin deploy 91fc19319be9e79d07159303dff125f40f10e5c25614630dcbed23d95e36f907
Copying /etc changes: 2 modified, 3 removed, 4 added
bootfs is sufficient for calculated new size: 0 bytes
Transaction complete; bootconfig swap: yes; bootversion: boot.0.1, deployment count change: 1

$ ls /boot/loader/entries
ostree-1.conf  ostree-2+3.conf

[1] https://uapi-group.org/specifications/specs/boot_loader_specification/#boot-counting
Signed-off-by: Igor Opaniuk <[email protected]>
@igoropaniuk
Copy link
Author

igoropaniuk commented Dec 10, 2024

@jlebon @cgwalters all comments are addressed, any additional suggestions/objections are welcome, thanks!

BTW, I've cross-checked CI checks that failed, looks like they are unrelated again

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

Successfully merging this pull request may close these issues.

3 participants