This commit adds the menu entry to delete the UEFI boot option.
User moves the entry with UP/DOWN key, changes, then presses
ENTER key to delete the selected boot option.
Signed-off-by: Masahisa Kojima <masahisa.koj...@linaro.org>
---
Changes in v9:
- add function comment
Changes in v8:
- function and structure prefix is changed to "eficonfig"
Changes in v7:
- to stay the boot order list after user delete the entry
no update in v6:
changes in v5:
cmd/eficonfig.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c
index aeb60f1d09..51d4e36a54 100644
--- a/cmd/eficonfig.c
+++ b/cmd/eficonfig.c
@@ -1711,6 +1711,81 @@ out:
return ret;
}
+/**
+ * delete_boot_option() - delete selected boot option
+ *
+ * @bootorder: pointer to the bootorder
+ * @index: index to delete in the BootOrder variable
+ * @size: Bootorder variable size
+ * Return: status code
+ */
+static efi_status_t delete_boot_option(u16 *bootorder, u16 index, efi_uintn_t
size)
+{
+ u16 varname[9];
+ efi_status_t ret;
+ efi_uintn_t num;
+
+ efi_create_indexed_name(varname, sizeof(varname),
+ "Boot", bootorder[index]);
+ ret = efi_set_variable_int(varname, &efi_global_variable_guid,
+ 0, 0, NULL, false);
+ if (ret != EFI_SUCCESS) {
+ log_err("delete boot option(%ls) failed\n", varname);
+ return ret;
+ }
+
+ /* update BootOrder */
+ num = size / sizeof(u16);
+ memmove(&bootorder[index], &bootorder[index + 1],
+ (num - index - 1) * sizeof(u16));
+ size -= sizeof(u16);
+ ret = efi_set_variable_int(u"BootOrder", &efi_global_variable_guid,
+ EFI_VARIABLE_NON_VOLATILE |
+ EFI_VARIABLE_BOOTSERVICE_ACCESS |
+ EFI_VARIABLE_RUNTIME_ACCESS,
+ size, bootorder, false);
+
+ return ret;
+}
+
+/**
+ * eficonfig_process_delete_boot_option() - handler to delete boot option
+ *
+ * @data: pointer to the data for each entry
+ * Return: status code
+ */
+static efi_status_t eficonfig_process_delete_boot_option(void *data)
+{
+ int selected;
+ u16 *bootorder;
+ efi_status_t ret;
+ efi_uintn_t num, size;
+
+ while (1) {
+ bootorder = efi_get_var(u"BootOrder",
&efi_global_variable_guid, &size);
+ if (!bootorder) {
+ eficonfig_print_msg("BootOrder is not defined!");
+ ret = EFI_NOT_FOUND;
+ return ret;
+ }
+
+ num = size / sizeof(u16);
+ ret = eficonfig_show_boot_selection(bootorder, num, &selected);
+ if (ret == EFI_SUCCESS)
+ ret = delete_boot_option(bootorder, selected, size);
+
+ if (ret != EFI_SUCCESS)
+ break;
+ }
+
+ free(bootorder);
+
+ /* to stay the parent menu */
+ ret = (ret == EFI_ABORTED) ? EFI_NOT_READY : ret;
+
+ return ret;
+}
+
/**
* eficonfig_init() - do required initialization for eficonfig command
*
@@ -1742,6 +1817,7 @@ static const struct eficonfig_item
maintenance_menu_items[] = {
{"Add Boot Option", eficonfig_process_add_boot_option},
{"Edit Boot Option", eficonfig_process_edit_boot_option},
{"Change Boot Order", eficonfig_process_change_boot_order},
+ {"Delete Boot Option", eficonfig_process_delete_boot_option},
{"Quit", eficonfig_process_quit},
};
--
2.17.1
