-
Notifications
You must be signed in to change notification settings - Fork 305
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
base: main
Are you sure you want to change the base?
Conversation
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 Once the patch is verified, the new status will be reflected by the 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. |
This PR was created for initial feedback, I'll address the naming in the tests if needed and re-push |
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 |
@cgwalters thanks for the feedback, my concern regarding parsing A can add an optional autoconf flag for that |
6b33424
to
8ea23c7
Compare
@cgwalters added support for |
There was a problem hiding this 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!
BTW, which bootloader are you looking at using this with? |
@cgwalters EDK2 + systemd-boot |
8ea23c7
to
4bce924
Compare
@cgwalters I've addressed all comments, thanks! |
4bce924
to
57e988e
Compare
@cgwalters looks like some CI tests are still failing, but all of them are unrelated to this change, for example:
|
Yes CI failures are unrelated, will look at this soon |
The PR is not stalled, I'll get back to it tomorrow |
030b79c
to
8802316
Compare
@jlebon @cgwalters all comments addressed, please take a look |
905317a
to
9ab2679
Compare
37ba251
to
087e056
Compare
087e056
to
a0f03d2
Compare
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]>
a0f03d2
to
7e4fe41
Compare
@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 |
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