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

Add support of bootloaders that follows BLS #103

Merged
merged 1 commit into from
Jul 3, 2024

Conversation

aplanas
Copy link
Contributor

@aplanas aplanas commented May 15, 2024

No description provided.

@aplanas
Copy link
Contributor Author

aplanas commented May 15, 2024

Depends on openSUSE/sdbootutil#92

@aplanas
Copy link
Contributor Author

aplanas commented May 15, 2024

cc @lnussel

@mwilck
Copy link
Contributor

mwilck commented May 15, 2024

So this supersedes #101? To my understanding, #101 was still an RFC.

@mwilck
Copy link
Contributor

mwilck commented May 15, 2024

For reasons unknown, the obs_scm server-side service failed, showing this package as broken. osc rebuild doesn't help. Retriggering the services doesn't help, either. The other current PRs (#101, #102, #104) don't exhibit this problem.

@aplanas, maybe just re-push, perhaps after applying a trivial commit msg change?

@mwilck
Copy link
Contributor

mwilck commented May 15, 2024

Both patches are rather large. @aplanas and @lnussel, please indicate whether #101 should be closed in favor of this one, and confirm that you've done at least basic testing.

@aplanas
Copy link
Contributor Author

aplanas commented May 15, 2024

So this supersedes #101? To my understanding, #101 was still an RFC.

Yes, it does.

@aplanas aplanas force-pushed the fix_sdboot branch 2 times, most recently from 5009a48 to 955ff46 Compare May 15, 2024 17:40
@aplanas
Copy link
Contributor Author

aplanas commented May 15, 2024

@aplanas, maybe just re-push, perhaps after applying a trivial commit msg change?

Re-pushed

@aplanas
Copy link
Contributor Author

aplanas commented May 15, 2024

Both patches are rather large. @aplanas and @lnussel, please indicate whether #101 should be closed in favor of this one, and confirm that you've done at least basic testing.

The #101 commit is included here, and later changed and updated by the second one. #101 can be ignored.

@mwilck mwilck mentioned this pull request May 15, 2024
@mwilck
Copy link
Contributor

mwilck commented May 15, 2024

Re-pushed

Hm, weird, the OBS project is still broken.

@aplanas
Copy link
Contributor Author

aplanas commented May 16, 2024

can the issue be reproduced locally?

@aplanas
Copy link
Contributor Author

aplanas commented May 16, 2024

I squashed the commit jic

@mwilck
Copy link
Contributor

mwilck commented May 16, 2024

Hm the OBS project is hosed somehow, no idea why. I'll try to fix it manually.

@mwilck
Copy link
Contributor

mwilck commented May 16, 2024

@aplanas, the problem is that you changed the revision in the _service file to your suse-module-tools clone, and your github clone doesn't have any tags:

$ git ls-remote
From https://github.com/aplanas/suse-module-tools
2e7447774e720050841ea03eb9f8447191eeffde	HEAD
5ba5b2324176ec88db514bad2f1abb19207d2ab5	refs/heads/fix_sdboot
2e7447774e720050841ea03eb9f8447191eeffde	refs/heads/master

If you just push the 16.0.43 tag to github.com/aplanas/suse-module-tools, the OBS build should be fine.

@aplanas
Copy link
Contributor Author

aplanas commented May 16, 2024

rebased and pushed 16.0.43 tag

@mwilck
Copy link
Contributor

mwilck commented May 16, 2024

rebased and pushed 16.0.43 tag

Yep, build succeeds now. Thanks!

@aplanas aplanas force-pushed the fix_sdboot branch 2 times, most recently from be33376 to 2faec67 Compare May 29, 2024 07:51
@aplanas
Copy link
Contributor Author

aplanas commented May 29, 2024

Also depends on: openSUSE/transactional-update#122

@mwilck I changed the code a bit in the regenerate initrd post-transaction script. It is using now a new candidate feature for tukit (plugins), that will avoid the use of /dev/shm.

This tukit extension has not been merged, but what do you think about the rest of the changes?

@mwilck
Copy link
Contributor

mwilck commented May 29, 2024

Sorry I haven't had time for this yet. It's high on my todo list but I'm busy with lots of bug reports.

@aplanas
Copy link
Contributor Author

aplanas commented Jun 5, 2024

Update the code. In rpm-script the sdbootutil detection checks also that there is no bootloader installed. If this is the case assume that sdbootutil will be installed.

This is of use when generating an image, as when the kernel is installed there is still no bootloader in /boot

Copy link
Contributor

@mwilck mwilck left a comment

Choose a reason for hiding this comment

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

Hi Alberto, thanks! I've got a few remarks.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
weak-modules2 Outdated Show resolved Hide resolved
weak-modules2 Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
weak-modules2 Show resolved Hide resolved
@aplanas aplanas force-pushed the fix_sdboot branch 4 times, most recently from 678165b to 09d1407 Compare June 13, 2024 18:25
@aplanas
Copy link
Contributor Author

aplanas commented Jun 13, 2024

@mwilck I pushed a new commit with the changes for review.

@aplanas aplanas requested a review from mwilck June 13, 2024 20:21
@aplanas
Copy link
Contributor Author

aplanas commented Jun 19, 2024

ping?

@aplanas
Copy link
Contributor Author

aplanas commented Jun 28, 2024

@mwilck should we continue with the review?

@TobiPeterG
Copy link

I think this would fix openSUSE/sdbootutil#22

Copy link
Contributor

@mwilck mwilck left a comment

Choose a reason for hiding this comment

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

LGTM, except for the script_rc treatment (which you can revert to the 1st version of the patch set).

When this is done, I'll give the set a final review pass, and merge.

kernel-scriptlets/rpm-script Show resolved Hide resolved
kernel-scriptlets/rpm-script Outdated Show resolved Hide resolved
@aplanas
Copy link
Contributor Author

aplanas commented Jul 2, 2024

I will squash the commits once all is reviewed

Copy link
Contributor

@mwilck mwilck left a comment

Choose a reason for hiding this comment

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

LGTM.

Use sdbootutil to generate boot loader entries, install new kernels and
update the initrd for new modules.

Signed-off-by: Alberto Planas <[email protected]>
@aplanas
Copy link
Contributor Author

aplanas commented Jul 3, 2024

squashed

@mwilck mwilck merged commit 61c0873 into openSUSE:master Jul 3, 2024
9 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.

3 participants