Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

EFI System Partition cleanups #98

Merged
merged 5 commits into from
Jan 3, 2025
Merged

Conversation

marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Jan 3, 2025

Minor fixes that help clarify the #88 situation a bit.

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 <marc.herbert@intel.com>
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 <marc.herbert@intel.com>
It is automatically offered by systemd-boot when in the right place.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
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 <marc.herbert@intel.com>
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 <marc.herbert@intel.com>
@stellarhopper stellarhopper merged commit 571357d into pmem:main Jan 3, 2025
2 checks passed
@marc-hb marc-hb deleted the esp-cleanups branch January 3, 2025 23:42
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants