X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=6888fa70f5367476e907dd8ffdc4bfcbcfb25eb8;hp=56e7653af112c67e8f0afc67c6fc45b4d6cb794e;hb=1949b1f0f990c7ab171339e20731fe6b17c92d8f;hpb=7df003a0d222ae08bff62de4fefff1cf56628123

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 56e7653..6888fa7 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -75,10 +75,14 @@ static void cui_start(void)
 	 * Petitboot to exit if they're left undefined */
 	define_key("\x1b\x5b\x35\x7e", KEY_PPAGE);
 	define_key("\x1b\x5b\x36\x7e", KEY_NPAGE);
+	define_key("\x1b\x5b\x31\x7e", KEY_HOME);
+	define_key("\x1b\x5b\x34\x7e", KEY_END);
 	define_key("\x1b\x4f\x48", KEY_HOME);
 	define_key("\x1b\x4f\x46", KEY_END);
 	define_key("OH", KEY_HOME);
 	define_key("OF", KEY_END);
+	define_key("\x1b\x5b\x41", KEY_UP);
+	define_key("\x1b\x5b\x42", KEY_DOWN);
 
 	while (getch() != ERR)		/* flush stdin */
 		(void)0;
@@ -698,6 +702,9 @@ static void cui_update_sysinfo(struct system_info *sysinfo, void *arg)
 	if (cui->sysinfo_screen)
 		sysinfo_screen_update(cui->sysinfo_screen, sysinfo);
 
+	if (cui->subset_screen)
+		subset_screen_update(cui->subset_screen);
+
 	/* ... and do the same with the config screen... */
 	if (cui->config_screen)
 		config_screen_update(cui->config_screen, cui->config, sysinfo);
@@ -744,6 +751,9 @@ static void cui_update_config(struct config *config, void *arg)
 	if (config->lang)
 		cui_update_language(cui, config->lang);
 
+	if (cui->subset_screen)
+		subset_screen_update(cui->subset_screen);
+
 	if (cui->config_screen)
 		config_screen_update(cui->config_screen, config, cui->sysinfo);
 
@@ -895,7 +905,7 @@ static struct discover_client_ops cui_client_ops = {
  */
 
 struct cui *cui_init(void* platform_info,
-	int (*js_map)(const struct js_event *e), int start_deamon)
+	int (*js_map)(const struct js_event *e), int start_daemon)
 {
 	struct cui *cui;
 	unsigned int i;
@@ -916,7 +926,7 @@ struct cui *cui_init(void* platform_info,
 	/* Loop here for scripts that just started the server. */
 
 retry_start:
-	for (i = start_deamon ? 2 : 10; i; i--) {
+	for (i = start_daemon ? 2 : 15; i; i--) {
 		cui->client = discover_client_init(cui->waitset,
 				&cui_client_ops, cui);
 		if (cui->client || !i)
@@ -925,10 +935,10 @@ retry_start:
 		sleep(1);
 	}
 
-	if (!cui->client && start_deamon) {
+	if (!cui->client && start_daemon) {
 		int result;
 
-		start_deamon = 0;
+		start_daemon = 0;
 
 		result = pb_start_daemon(cui);