X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=2d4dea59a77d1ae872443e577480b143f780d6d8;hp=f47e3243de0aa12a48e432ab68507639f2f23cd7;hb=80c072a44cb665495afe08ce37cbf4f2086d5529;hpb=6b842bb2559116a949c6a569ac39f5c56ebc1be1

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index f47e324..2d4dea5 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -25,6 +25,7 @@
 #include <sys/ioctl.h>
 
 #include "log/log.h"
+#include "pb-protocol/pb-protocol.h"
 #include "talloc/talloc.h"
 #include "waiter/waiter.h"
 #include "ui/common/discover-client.h"
@@ -125,24 +126,23 @@ int cui_run_cmd(struct pmenu_item *item)
 }
 
 /**
- * cui_run_kexec - A generic cb to run kexec.
+ * cui_boot - A generic cb to run kexec.
  */
 
-static int cui_run_kexec(struct pmenu_item *item)
+static int cui_boot(struct pmenu_item *item)
 {
 	int result;
 	struct cui *cui = cui_from_item(item);
 	struct cui_opt_data *cod = cod_from_item(item);
 
 	assert(cui->current == &cui->main->scr);
-	assert(cui->on_kexec);
 
 	pb_log("%s: %s\n", __func__, cod->name);
 	nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
 	def_prog_mode();
 
-	result = cui->on_kexec(cui, cod);
+	result = discover_client_boot(cui->client, cod->dev, cod->opt, cod->bd);
 
 	reset_prog_mode();
 	redrawwin(cui->current->main_ncw);
@@ -151,12 +151,11 @@ static int cui_run_kexec(struct pmenu_item *item)
 		clear();
 		mvaddstr(1, 0, "system is going down now...");
 		refresh();
-		sleep(cui->dry_run ? 1 : 60);
+	} else {
+		nc_scr_status_printf(cui->current,
+				"Failed: boot %s", cod->bd->image);
 	}
 
-	pb_log("%s: failed: %s\n", __func__, cod->bd->image);
-	nc_scr_status_printf(cui->current, "Failed: kexec %s", cod->bd->image);
-
 	return 0;
 }
 
@@ -264,17 +263,6 @@ static int cui_process_js(void *arg)
 
 	return 0;
 }
-/**
- * cui_client_process_socket - Process a socket event from the discover server.
- */
-
-static int cui_client_process_socket(void *arg)
-{
-	struct discover_client *client = arg;
-
-	discover_client_process(client);
-	return 0;
-}
 
 /**
  * cui_handle_timeout - Handle the timeout.
@@ -341,7 +329,7 @@ void cui_on_open(struct pmenu *menu)
 	i = pmenu_item_alloc(menu);
 
 	i->on_edit = cui_boot_editor_run;
-	i->on_execute = cui_run_kexec;
+	i->on_execute = cui_boot;
 	i->data = cod = talloc_zero(i, struct cui_opt_data);
 
 	cod->name = talloc_asprintf(i, "User item %u:", insert_pt);
@@ -407,7 +395,7 @@ static int cui_device_add(struct device *dev, void *arg)
 		opt->ui_info = i = pmenu_item_alloc(cui->main);
 
 		i->on_edit = cui_boot_editor_run;
-		i->on_execute = cui_run_kexec;
+		i->on_execute = cui_boot;
 		i->data = cod = talloc(i, struct cui_opt_data);
 
 		cod->dev = dev;
@@ -533,11 +521,9 @@ static struct discover_client_ops cui_client_ops = {
  */
 
 struct cui *cui_init(void* platform_info,
-	int (*on_kexec)(struct cui *, struct cui_opt_data *),
-	int (*js_map)(const struct js_event *e), int start_deamon, int dry_run)
+	int (*js_map)(const struct js_event *e), int start_deamon)
 {
 	struct cui *cui;
-	struct discover_client *client;
 	unsigned int i;
 
 	cui = talloc_zero(NULL, struct cui);
@@ -550,23 +536,22 @@ struct cui *cui_init(void* platform_info,
 
 	cui->c_sig = pb_cui_sig;
 	cui->platform_info = platform_info;
-	cui->on_kexec = on_kexec;
 	cui->timer.handle_timeout = cui_handle_timeout;
-	cui->dry_run = dry_run;
 	cui->waitset = waitset_create(cui);
 
 	/* Loop here for scripts that just started the server. */
 
 retry_start:
 	for (i = start_deamon ? 2 : 10; i; i--) {
-		client = discover_client_init(&cui_client_ops, cui);
-		if (client || !i)
+		cui->client = discover_client_init(cui->waitset,
+				&cui_client_ops, cui);
+		if (cui->client || !i)
 			break;
 		pb_log("%s: waiting for server %d\n", __func__, i);
 		sleep(1);
 	}
 
-	if (!client && start_deamon) {
+	if (!cui->client && start_deamon) {
 		int result;
 
 		start_deamon = 0;
@@ -584,7 +569,7 @@ retry_start:
 		goto fail_client_init;
 	}
 
-	if (!client) {
+	if (!cui->client) {
 		pb_log("%s: discover_client_init failed.\n", __func__);
 		fprintf(stderr, "%s: error: discover_client_init failed.\n",
 			__func__);
@@ -596,9 +581,6 @@ retry_start:
 	atexit(nc_atexit);
 	nc_start();
 
-	waiter_register(cui->waitset, discover_client_get_fd(client), WAIT_IN,
-			cui_client_process_socket, client);
-
 	waiter_register(cui->waitset, STDIN_FILENO, WAIT_IN,
 			cui_process_key, cui);