summaryrefslogtreecommitdiffstats
path: root/ui/common
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-10-10 16:00:17 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-10-10 16:08:54 +0800
commit03d135e3d7528184062cc16949febd76c393c30d (patch)
treebe9cce3b3ec9195b19d9fb7c9a94997b4631913a /ui/common
parent6d1eff1e8e1db12e7aa179e8dc9c65050c045536 (diff)
downloadpetitboot-03d135e3d7528184062cc16949febd76c393c30d.zip
petitboot-03d135e3d7528184062cc16949febd76c393c30d.tar.gz
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 <jk@ozlabs.org>
Diffstat (limited to 'ui/common')
-rw-r--r--ui/common/discover-client.c3
1 files changed, 1 insertions, 2 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;
OpenPOWER on IntegriCloud