From 03d135e3d7528184062cc16949febd76c393c30d Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 10 Oct 2013 16:00:17 +0800 Subject: ui/ncurses: Allow booting custom boot options Currently, we can't boot user-created boot options, as they have no option ID associated. This change removes the check for option ID. Signed-off-by: Jeremy Kerr --- ui/common/discover-client.c | 3 +-- ui/ncurses/nc-cui.c | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c index 90cd3b4..fea8c57 100644 --- a/ui/common/discover-client.c +++ b/ui/common/discover-client.c @@ -264,8 +264,7 @@ static void create_boot_command(struct boot_command *command, const struct boot_option *boot_option, const struct pb_boot_data *data) { - - command->option_id = boot_option->id; + command->option_id = boot_option ? boot_option->id : NULL; command->boot_image_file = data->image; command->initrd_file = data->initrd; command->dtb_file = data->dtb; diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 8555848..33a9f73 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -113,10 +113,6 @@ static int cui_boot(struct pmenu_item *item) assert(cui->current == &cui->main->scr); pb_log("%s: %s\n", __func__, cod->name); - if (!cod->opt) { - pb_log("%s: missing opt?\n", __func__); - return -1; - } nc_scr_status_printf(cui->current, "Booting %s...", cod->name); -- cgit v1.2.1