]> git.ozlabs.org Git - petitboot/blobdiff - ui/ncurses/nc-cui.c
Remove unused ked status ked_boot.
[petitboot] / ui / ncurses / nc-cui.c
index 179222e39adcc54a82c508c5d5ce766fd594d80e..bfb74b6a539771fca0b838ca89c52d6a05791958 100644 (file)
@@ -140,7 +140,7 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
 {
        struct cui *cui = cui_from_arg(ked->scr.ui_ctx);
 
-       if (ked_result == ked_update || ked_result == ked_boot) {
+       if (ked_result == ked_update) {
                struct pmenu_item *i = pmenu_find_selected(cui->main);
                struct cui_opt_data *cod = cod_from_item(i);
 
@@ -159,11 +159,6 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
        cui_set_current(cui, &cui->main->scr);
 
        talloc_free(ked);
-
-       if (ked_result == ked_boot) {
-               struct pmenu_item *i = pmenu_find_selected(cui->main);
-               i->on_execute(i);
-       }
 }
 
 int cui_ked_run(struct pmenu_item *item)
@@ -289,7 +284,7 @@ void cui_on_open(struct pmenu *menu)
        i = pmenu_item_alloc(menu);
 
        name = talloc_asprintf(i, "User item %u:", insert_pt);
-       pmenu_item_setup(menu, i, insert_pt, name, NULL);
+       pmenu_item_setup(menu, i, insert_pt, name);
 
        i->on_edit = cui_ked_run;
        i->on_execute = cui_run_kexec;
@@ -351,7 +346,6 @@ static int cui_device_add(struct device *dev, void *arg)
                struct pmenu_item *i;
                struct cui_opt_data *cod;
                char *name;
-               char *description;
 
                /* Save the item in opt->ui_info for cui_device_remove() */
 
@@ -360,13 +354,7 @@ static int cui_device_add(struct device *dev, void *arg)
                name = talloc_asprintf(i, "%s: %s", opt->name,
                        opt->description);
 
-               description = talloc_asprintf(i,
-                       " kexec: image='%s' initrd='%s' args='%s'",
-                       opt->boot_image_file,
-                       opt->initrd_file,
-                       opt->boot_args);
-
-               pmenu_item_setup(cui->main, i, insert_pt, name, description);
+               pmenu_item_setup(cui->main, i, insert_pt, name);
 
                i->on_edit = cui_ked_run;
                i->on_execute = cui_run_kexec;