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

Avoid creating duplicate Boot* vars.

Browse Source 
Attempt to find variables with exaact same content before creating a new
one.
This commit is contained in:
Arzhan Kinzhalin
2017-08-18 06:53:38 +00:00
parent eacdfc4293
commit 30e9f06760
1 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/efi/cbm_efi.c
+44 -5
View File
@@ -131,6 +131,29 @@ static int find_free_boot_rec(void) {
return res;
}
static boot_rec_t *find_boot_rec(uint8_t *data, size_t size) {
boot_rec_t *c = boot_recs;
boot_rec_t *res = NULL;
uint8_t *cdata;
size_t csize;
uint32_t cattr;
if (!boot_recs) return NULL;
if (boot_recs_cnt < 1) return NULL;
do {
if (efi_get_variable(EFI_GLOBAL_GUID, c->name, &cdata, &csize, &cattr) < 0) continue;
if (csize == size && !memcmp(cdata, data, csize)) {
res = c;
break;
}
} while ((c = c->next));
return res;
}
typedef struct part_info {
char *disk_path;
int part_no;
@@ -176,11 +199,9 @@ int efi_create_boot_rec(const char *bootloader_host_path, const char *bootloader
uint32_t boot_var_attr = EFI_VARIABLE_NON_VOLATILE
| EFI_VARIABLE_BOOTSERVICE_ACCESS
| EFI_VARIABLE_RUNTIME_ACCESS;
int slot = find_free_boot_rec();
boot_rec_t *rec;
ssize_t len;
if (slot < 0) return -1;
if (get_part_info(bootloader_host_path, &pi)) return -1;
len = efi_generate_file_device_path_from_esp(fdev_path, PATH_MAX, pi.disk_path, pi.part_no, bootloader_esp_path, EFIBOOT_ABBREV_HD);
@@ -193,8 +214,26 @@ int efi_create_boot_rec(const char *bootloader_host_path, const char *bootloader
if (len < 0) return -1;
if (asprintf(&boot_var_name, "%s%04x", "Boot", slot) < 0) return -1;
if (efi_set_variable(EFI_GLOBAL_GUID, boot_var_name, boot_var_data, (size_t)len, boot_var_attr, 0644) < 0) return -1;
if (!(rec = find_boot_rec(boot_var_data, (size_t)len))) {
int slot = find_free_boot_rec();
boot_rec_t *c;
if (slot < 0) return -1;
if (asprintf(&boot_var_name, "%s%04x", "Boot", slot) < 0) return -1;
if (efi_set_variable(EFI_GLOBAL_GUID, boot_var_name, boot_var_data, (size_t)len, boot_var_attr, 0644) < 0) return -1;
/* re-read the records and find the variable that was just created. */
if (read_boot_recs() < 0) return -1;
if (!boot_recs) return -1; /* something went terribly wrong */
c = boot_recs;
do {
if (!strcmp(c->name, boot_var_name)) {
rec = c;
break;
}
} while ((c = c->next));
if (!rec) return -1;
}
/* TODO: put the var first in the boot order */
return 0;
}