Just use the item name, rather than including boot option details.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-/**
- * cui_make_item_name - Format the menu item name srting.
- *
- * Returns a talloc string.
- */
-
-static char *cui_make_item_name(struct pmenu_item *i, struct cui_opt_data *cod)
-{
- char *name;
-
- assert(cod->name);
- assert(cod->bd);
-
- name = talloc_asprintf(i, "%s:", cod->name);
-
- if (cod->bd->image)
- name = talloc_asprintf_append(name, " %s", cod->bd->image);
-
- if (cod->bd->initrd)
- name = talloc_asprintf_append(name, " initrd=%s",
- cod->bd->initrd);
-
- if (cod->bd->args)
- name = talloc_asprintf_append(name, " %s", cod->bd->args);
-
- DBGS("@%s@\n", name);
- return name;
-}
-
/**
* cui_on_exit - A generic main menu ESC callback.
*/
/**
* cui_on_exit - A generic main menu ESC callback.
*/
if (boot_editor_result == boot_editor_update) {
struct pmenu_item *i = pmenu_find_selected(cui->main);
struct cui_opt_data *cod = cod_from_item(i);
if (boot_editor_result == boot_editor_update) {
struct pmenu_item *i = pmenu_find_selected(cui->main);
struct cui_opt_data *cod = cod_from_item(i);
talloc_free(cod->bd);
cod->bd = bd;
talloc_free(cod->bd);
cod->bd = bd;
- name = cui_make_item_name(i, cod);
- pmenu_item_replace(i, name);
+ pmenu_item_replace(i, cod->name);
/* FIXME: need to make item visible somehow */
set_current_item(cui->main->ncm, i->nci);
/* FIXME: need to make item visible somehow */
set_current_item(cui->main->ncm, i->nci);
unsigned int insert_pt;
struct pmenu_item *i;
ITEM *selected;
unsigned int insert_pt;
struct pmenu_item *i;
ITEM *selected;
int result;
pb_log("%s: %p %s\n", __func__, opt, opt->id);
int result;
pb_log("%s: %p %s\n", __func__, opt, opt->id);
cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
- name = cui_make_item_name(i, cod);
- pmenu_item_setup(cui->main, i, insert_pt, name);
+ pmenu_item_setup(cui->main, i, insert_pt, cod->name);
pb_log("%s: adding opt '%s'\n", __func__, cod->name);
pb_log(" image '%s'\n", cod->bd->image);
pb_log("%s: adding opt '%s'\n", __func__, cod->name);
pb_log(" image '%s'\n", cod->bd->image);