X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=9d8ebb9b766e6804ef026211bd200d84d280c85c;hp=cafd23a5778258db070b8b612889e2db4681c1a0;hb=651940467773d2e679f9210e02f4654fb05cd449;hpb=f1599796efed1eb67759cf42f47fe4bf6a9bf93c

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index cafd23a..9d8ebb9 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -126,6 +126,12 @@ struct pb_cui {
 	struct cui *cui;
 };
 
+static int pmenu_sysinfo(struct pmenu_item *item)
+{
+	cui_show_sysinfo(cui_from_item(item));
+	return 0;
+}
+
 /**
  * pb_mm_init - Setup the main menu instance.
  */
@@ -136,22 +142,27 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 	struct pmenu *m;
 	struct pmenu_item *i;
 
-	m = pmenu_init(pb_cui->cui, 1, cui_on_exit);
+	m = pmenu_init(pb_cui->cui, 3, cui_on_exit);
 
 	if (!m) {
 		pb_log("%s: failed\n", __func__);
 		return NULL;
 	}
 
-	m->on_open = cui_on_open;
+	m->on_new = cui_item_new;
 
-	m->scr.frame.title = talloc_asprintf(m,
+	m->scr.frame.ltitle = talloc_asprintf(m,
 		"Petitboot (" PACKAGE_VERSION ")");
+	m->scr.frame.rtitle = NULL;
 	m->scr.frame.help = talloc_strdup(m,
-		"ESC=exit, Enter=accept, e=edit, o=open");
+		"Enter=accept, e=edit, n=new, x=exit");
 	m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
 
-	i = pmenu_item_init(m, 0, "Exit to Shell");
+	i = pmenu_item_init(m, 0, " ");
+	item_opts_off(i->nci, O_SELECTABLE);
+	i = pmenu_item_init(m, 1, "System information");
+	i->on_execute = pmenu_sysinfo;
+	i = pmenu_item_init(m, 2, "Exit to shell");
 	i->on_execute = pmenu_exit_cb;
 
 	result = pmenu_setup(m);
@@ -206,6 +217,7 @@ int main(int argc, char *argv[])
 	int result;
 	int cui_result;
 	struct opts opts;
+	FILE *log;
 
 	result = opts_parse(&opts, argc, argv);
 
@@ -224,20 +236,15 @@ int main(int argc, char *argv[])
 		return EXIT_SUCCESS;
 	}
 
+	log = stderr;
 	if (strcmp(opts.log_file, "-")) {
-		FILE *log = fopen(opts.log_file, "a");
+		log = fopen(opts.log_file, "a");
 
 		if (!log)
 			log = fopen("/dev/null", "a");
+	}
 
-		assert(log);
-		pb_log_set_stream(log);
-	} else
-		pb_log_set_stream(stderr);
-
-#if defined(DEBUG)
-	pb_log_always_flush(1);
-#endif
+	pb_log_init(log);
 
 	pb_log("--- petitboot-nc ---\n");