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

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 9d8ebb9..7616788 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -18,9 +18,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#if defined(HAVE_CONFIG_H)
 #include "config.h"
-
-#define _GNU_SOURCE
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -36,6 +36,8 @@
 #include "ui/common/discover-client.h"
 #include "nc-cui.h"
 
+extern const char *main_menu_help_text;
+
 static void print_version(void)
 {
 	printf("petitboot-nc (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
@@ -132,6 +134,12 @@ static int pmenu_sysinfo(struct pmenu_item *item)
 	return 0;
 }
 
+static int pmenu_config(struct pmenu_item *item)
+{
+	cui_show_config(cui_from_item(item));
+	return 0;
+}
+
 /**
  * pb_mm_init - Setup the main menu instance.
  */
@@ -142,7 +150,7 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 	struct pmenu *m;
 	struct pmenu_item *i;
 
-	m = pmenu_init(pb_cui->cui, 3, cui_on_exit);
+	m = pmenu_init(pb_cui->cui, 4, cui_on_exit);
 
 	if (!m) {
 		pb_log("%s: failed\n", __func__);
@@ -155,14 +163,16 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 		"Petitboot (" PACKAGE_VERSION ")");
 	m->scr.frame.rtitle = NULL;
 	m->scr.frame.help = talloc_strdup(m,
-		"Enter=accept, e=edit, n=new, x=exit");
+		"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, " ");
 	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 = pmenu_item_init(m, 2, "System configuration");
+	i->on_execute = pmenu_config;
+	i = pmenu_item_init(m, 3, "Exit to shell");
 	i->on_execute = pmenu_exit_cb;
 
 	result = pmenu_setup(m);
@@ -173,6 +183,9 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 		goto fail_setup;
 	}
 
+	m->help_title = "main menu";
+	m->help_text = main_menu_help_text;
+
 	menu_opts_off(m->ncm, O_SHOWDESC);
 	set_menu_mark(m->ncm, " *");
 	set_current_item(m->ncm, i->nci);