EFI System Partition cleanups #98
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes the following `bootctl` warning: ``` /efi/loader/entries/run-qemu-kernel-6.12.0-dirty.conf:6: Unknown line 'source', ignoring. ``` The path argument does not make sense either. This line came with big commit 01c2116 ("run_qemu: fix bootable disk images"). Note `bootctl` _outputs_ a line prefixed with `source: foo.conf`, so maybe that's where the confusion came from. Signed-off-by: Marc Herbert <[email protected]>
Clears confusion and fixes the following error message: "Parsed PE file '/efi/EFI/Linux/linux-6.12.0-dirty.efi' is not a UKI." The EFI/ directory is for stuff that EFI can actually run. Also stop appending a bogus and confusing ".efi" filename extension. Signed-off-by: Marc Herbert <[email protected]>
It is automatically offered by systemd-boot when in the right place. Signed-off-by: Marc Herbert <[email protected]>
Fixes commit b4a9b65 ("run_qemu: remove unnecessary pushd/popd in update_rootfs_boot_kernel"). I still don't know what is the purpose of this symbolic link but now it at least points to something: what it used to point at before b4a9b65 Signed-off-by: Marc Herbert <[email protected]>
This does not fix pmem#88 at all but clears some of the confusion around it. Fixes: ``` $ file qbuild/mkosi.extra/boot/* qbuild/mkosi.extra/boot/System.map: broken symbolic link to ./qbuild/mkosi.extra/boot/System.map-6.12.0-dirty qbuild/mkosi.extra/boot/vmlinuz: broken symbolic link to ./qbuild/mkosi.extra/boot/vmlinuz-6.12.0-dirty ``` Fixes commit f9d7330 ("run_qemu: work around new systemd-based installkernel") which added these symbolic links. They never worked. Signed-off-by: Marc Herbert <[email protected]>
stellarhopper
approved these changes
Jan 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Minor fixes that help clarify the #88 situation a bit.