X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fpb-cui.c;h=972490acef49d2bb8e2ee0ecc4974cbbc3f52f15;hp=8022789c684257c7143ac3dd6508b2cea58d5614;hb=944bccf5409ce2ea8333423416128bb97eb10d6f;hpb=ea0a5877530a801713c80963c918c0a6f4072d8a;ds=sidebyside

diff --git a/ui/ncurses/pb-cui.c b/ui/ncurses/pb-cui.c
index 8022789..972490a 100644
--- a/ui/ncurses/pb-cui.c
+++ b/ui/ncurses/pb-cui.c
@@ -138,7 +138,7 @@ static int pb_kexec_cb(struct cui *cui, struct cui_opt_data *cod)
 {
 	struct pb_cui *pb = pb_from_cui(cui);
 
-	pb_log("%s: %s:%s\n", __func__, cod->dev->name, cod->opt->name);
+	pb_log("%s: %s\n", __func__, cod->name);
 
 	assert(pb->cui->current == &pb->cui->main->scr);
 
@@ -162,13 +162,14 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 		return NULL;
 	}
 
+	m->on_open = cui_on_open;
+
 	m->scr.frame.title = talloc_strdup(m, "Petitboot");
 	m->scr.frame.help = talloc_strdup(m,
-		"ESC=exit, Enter=accept, E,e=edit");
+		"ESC=exit, Enter=accept, e=edit, o=open");
 	m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
 
-	i = pmenu_item_init(m, 0, "Exit to Shell",
-		"Exit petitboot and return to a shell prompt");
+	i = pmenu_item_init(m, 0, "Exit to Shell");
 	i->on_execute = pmenu_exit_cb;
 
 	result = pmenu_setup(m);
@@ -268,7 +269,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	pb.cui = cui_init(&pb, pb_kexec_cb);
+	pb.cui = cui_init(&pb, pb_kexec_cb, NULL);
 
 	if (!pb.cui)
 		return EXIT_FAILURE;