X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=fe288ee3cad85f25628ab5ed0e45139b63803891;hp=67b0b618fac704d7ec25447561adcd1e9b16f627;hb=d2b12ddb905a74fa6b2e454142b0b9f71fd99398;hpb=ae3c354e844698bdb4ed35a6845aa9dca1e9205f

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 67b0b61..fe288ee 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -201,16 +201,25 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 		"Enter=accept, e=edit, n=new, x=exit, h=help");
 	m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
 
-	i = pmenu_item_init(m, 0, " ");
+	i = pmenu_item_create(m, " ");
 	item_opts_off(i->nci, O_SELECTABLE);
-	i = pmenu_item_init(m, 1, "System information");
+	pmenu_item_insert(m, i, 0);
+
+	i = pmenu_item_create(m, "System information");
 	i->on_execute = pmenu_sysinfo;
-	i = pmenu_item_init(m, 2, "System configuration");
+	pmenu_item_insert(m, i, 1);
+
+	i = pmenu_item_create(m, "System configuration");
 	i->on_execute = pmenu_config;
-	i = pmenu_item_init(m, 3, "Rescan devices");
+	pmenu_item_insert(m, i, 2);
+
+	i = pmenu_item_create(m, "Rescan devices");
 	i->on_execute = pmenu_reinit;
-	i = pmenu_item_init(m, 4, "Exit to shell");
+	pmenu_item_insert(m, i, 3);
+
+	i = pmenu_item_create(m, "Exit to shell");
 	i->on_execute = pmenu_exit_cb;
+	pmenu_item_insert(m, i, 4);
 
 	result = pmenu_setup(m);
 
@@ -302,7 +311,7 @@ int main(int argc, char *argv[])
 
 	pb_log_init(log);
 
-	if (opts.verbose)
+	if (opts.verbose == opt_yes)
 		pb_log_set_debug(true);
 
 	pb_log("--- petitboot-nc ---\n");