clearlinux/clr-boot-manager
2
0
Fork 0
mirror of https://github.com/clearlinux/clr-boot-manager.git synced 2026-10-03 23:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

bootman: Allow native UEFI to "win" on GPT system containing legacy boot

Browse Source 
Given the nature of a GPT system, it is permitted to have a legacy boot
partition, *and* an EFI System Partition. Thus, prior to this commit, a
chroot repair of a system would only ever find the legacy boot partition
and not the UEFI partition.

Likewise, in a booted system, we would run into the same problem, leading
to bricked systems on update. Now, we'll only try to determine a legacy
boot device if we're definitely not running in native UEFI mode, that is
to say, !image_mode, and /sys/firmware/efi exists. This allows us to skip
an unusable partition in favour of our ESP.

This commit fixes #58.

Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>
This commit is contained in:
Ikey Doherty
2017-03-30 10:07:25 -07:00
committed by William Douglas
parent 834dbe7fb6
commit 7399e96d69
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bootman/sysconfig.c
+21 -10
View File
@@ -44,6 +44,7 @@ SystemConfig *cbm_inspect_root(const char *path, bool image_mode)
char *realp = NULL;
char *boot = NULL;
char *rel = NULL;
bool native_uefi = false;
realp = realpath(path, NULL);
if (!realp) {
@@ -60,8 +61,25 @@ SystemConfig *cbm_inspect_root(const char *path, bool image_mode)
c->prefix = realp;
c->wanted_boot_mask = 0;
/* Find legacy relative to root, on GPT */
boot = get_legacy_boot_device(realp);
/* Determine if this is a native UEFI system. This means we're in a full
* native mode and have /sys/firmware/efi available. This does not throw
* the image generation, and subsequent updates to the legacy image
* wouldn't have a UEFI vfs available.
*/
if (!image_mode) {
/* typically /sys, but we forcibly fail this with our tests */
autofree(char) *fw_path =
string_printf("%s/firmware/efi", cbm_system_get_sysfs_path());
native_uefi = nc_file_exists(fw_path);
}
/* Find legacy relative to root, on GPT, assuming we're not booted using
* UEFI. This is due to GPT being able to contain a legacy boot device
* *and* an ESP at the same time. Native UEFI takes precedence.
*/
if (!native_uefi) {
boot = get_legacy_boot_device(realp);
}
if (boot) {
c->boot_device = boot;
c->wanted_boot_mask = BOOTLOADER_CAP_LEGACY | BOOTLOADER_CAP_GPT;
@@ -82,14 +100,7 @@ SystemConfig *cbm_inspect_root(const char *path, bool image_mode)
* the root system if we're in image mode.
*/
if (!image_mode) {
/* typically /sys, but we forcibly fail this with our tests */
autofree(char) *fw_path =
string_printf("%s/firmware/efi", cbm_system_get_sysfs_path());
if (nc_file_exists(fw_path)) {
c->wanted_boot_mask = BOOTLOADER_CAP_UEFI;
} else {
c->wanted_boot_mask = BOOTLOADER_CAP_LEGACY;
}
c->wanted_boot_mask = native_uefi ? BOOTLOADER_CAP_UEFI : BOOTLOADER_CAP_LEGACY;
} else {
/* At this point, just assume we have a plain UEFI system */
c->wanted_boot_mask = BOOTLOADER_CAP_UEFI;