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

Fixes for UKI without sd-boot, UKI with legacy installkernel, and rEFInd #51

Closed
wants to merge 6 commits into from

Conversation

Nowa-Ammerlaan
Copy link
Contributor

  • legacy installkernel also installs config and System.map, clean these up if we can find them
  • UKIs may be installed without an installation of systemd-boot present on the ESP, this means we have UKI's in ESP/EFI/Linux but no ESP/loader directory. Extend ESP finding logic to also take into account this case.

On systems without systemd-boot we might still install and boot UKIs,
with e.g. refind, or directly from firmware. On such systems the 'loader'
directory (bls type 1) won't be present. Instead we only have the
ESP/EFI/Linux directory (bls type 2), which we still want to clean-up.

Signed-off-by: Andrew Ammerlaan <[email protected]>
@Nowa-Ammerlaan Nowa-Ammerlaan force-pushed the generalize-uki branch 2 times, most recently from a93febd to ee5f25b Compare April 23, 2024 18:36
@Nowa-Ammerlaan Nowa-Ammerlaan changed the title Fixes for UKI without sd-boot and UKI with legacy installkernel Fixes for UKI without sd-boot, UKI with legacy installkernel, and rEFInd Apr 23, 2024
@Nowa-Ammerlaan Nowa-Ammerlaan force-pushed the generalize-uki branch 2 times, most recently from 0b41b5f to 85edf4c Compare April 23, 2024 19:04
@Nowa-Ammerlaan
Copy link
Contributor Author

@mgorny This is now ready I think. I added the fixes for rEFInd icon files here as well to avoid rebasing later.

Copy link
Member

@mgorny mgorny left a comment

Choose a reason for hiding this comment

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

Also add copyright lines for yourself.

ecleankernel/layout/blspec.py Outdated Show resolved Hide resolved
ecleankernel/layout/blspec.py Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
ecleankernel/layout/blspec.py Outdated Show resolved Hide resolved
tox.ini Outdated Show resolved Hide resolved
ecleankernel/layout/blspec.py Outdated Show resolved Hide resolved
test/test_layout_std.py Show resolved Hide resolved
@Nowa-Ammerlaan Nowa-Ammerlaan force-pushed the generalize-uki branch 6 times, most recently from dc5f2bc to 1a1a4f4 Compare May 7, 2024 18:49
@Nowa-Ammerlaan Nowa-Ammerlaan requested a review from mgorny May 7, 2024 18:50
Copy link
Member

@mgorny mgorny left a comment

Choose a reason for hiding this comment

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

Also feel free to add a commit fixing quotes in surrounding code.

ecleankernel/layout/std.py Outdated Show resolved Hide resolved
ecleankernel/layout/blspec.py Outdated Show resolved Hide resolved
@Nowa-Ammerlaan Nowa-Ammerlaan force-pushed the generalize-uki branch 3 times, most recently from df128f5 to 2090440 Compare May 7, 2024 19:21
@Nowa-Ammerlaan Nowa-Ammerlaan requested a review from mgorny May 7, 2024 19:23
tox.ini Show resolved Hide resolved
ecleankernel/layout/blspec.py Outdated Show resolved Hide resolved
@Nowa-Ammerlaan Nowa-Ammerlaan force-pushed the generalize-uki branch 2 times, most recently from 07d64fc to 8d15663 Compare May 8, 2024 08:48
this works around a bug in tox.ini where it does not take into account
the dependencies of the package

Signed-off-by: Andrew Ammerlaan <[email protected]>
Copy link
Member

@mgorny mgorny left a comment

Choose a reason for hiding this comment

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

LGTM.

@mgorny mgorny closed this in 06920cb May 8, 2024
@Nowa-Ammerlaan Nowa-Ammerlaan deleted the generalize-uki branch May 8, 2024 08:56
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