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

Skip UEFI or BIOS on none hybrid partition layout #729

Merged
merged 1 commit into from
Sep 24, 2024

Conversation

HuijingHei
Copy link
Member

  • When booting with BIOS and no ESP device detected, skip UEFI checking
  • When booting with UEFI and no bios_boot partition found, skip BIOS checking

Fixes #717

@HuijingHei
Copy link
Member Author

HuijingHei commented Sep 20, 2024

The CI will not cover related testing, do some testing manually on none hybrid partition layout:

Additional info, need to run semanage permissive -a bootupd_t before testing:

on BIOS

root@fedora:/home/fedora# bootupctl status
Running as unit: bootupd.service
Component BIOS
  Installed: grub2-tools-1:2.12-4.fc41.x86_64
  Update: At latest version
No components are adoptable.
Boot method: BIOS

root@fedora:/home/fedora# bootupctl validate
Running as unit: bootupd.service; invocation ID: 8ec29c38bb534882b7f509ea10be9cf9
Skipped: BIOS

root@fedora:/home/fedora# rm -f /boot/bootupd-state.json 
root@fedora:/home/fedora# bootupctl update
Running as unit: bootupd.service
Adopted and updated: BIOS: grub2-tools-1:2.12-4.fc41.x86_64

on UEFI

root@fedora:/home/fedora# bootupctl status
Running as unit: bootupd.service
Component EFI
  Installed: grub2-efi-ia32-1:2.12-4.fc41.x86_64,grub2-efi-x64-1:2.12-4.fc41.x86_64,shim-ia32-15.8-3.x86_64,shim-x64-15.8-3.x86_64
  Update: At latest version
No components are adoptable.
Boot method: EFI

root@fedora:/home/fedora# bootupctl validate
Running as unit: bootupd.service; invocation ID: a98fa7e453064291a16594dc83a15c9b
Validated: EFI

root@fedora:/home/fedora# rm -f /boot/bootupd-state.json
root@fedora:/home/fedora# bootupctl update
Running as unit: bootupd.service
Adopted and updated: EFI: grub2-efi-ia32-1:2.12-4.fc41.x86_64,grub2-efi-x64-1:2.12-4.fc41.x86_64,shim-ia32-15.8-3.x86_64,shim-x64-15.8-3.x86_64

@HuijingHei HuijingHei force-pushed the skip-check-component branch 3 times, most recently from 1274132 to bb5b41b Compare September 20, 2024 14:16
- When booting with `BIOS` and no `ESP` device detected, skip `UEFI`
checking
- When booting with `UEFI` and no `bios_boot` partition found, skip
`BIOS` checking

Fixes coreos#717
Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

This looks sane to me...I assume you tested it on the target env?

src/bios.rs Show resolved Hide resolved
@HuijingHei
Copy link
Member Author

This looks sane to me...I assume you tested it on the target env?

Yes, see #729 (comment), do some testings on silverblue using BIOS or using UEFI, both work. Will update this according to your suggestion and do testing again.

@cgwalters cgwalters merged commit de4dafb into coreos:main Sep 24, 2024
12 checks passed
@cgwalters
Copy link
Member

Will update this according to your suggestion

I think this can be a followup, no need to block on it.

@HuijingHei
Copy link
Member Author

Will update this according to your suggestion

I think this can be a followup, no need to block on it.

SGTM, thanks for the review and pointer!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adoption failure on Atomic Desktops using BIOS
2 participants