X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=c26819faeec7f988499934beb6f93902df3265f5;hp=51c14720dd760b1effc0bdca1600824eba095611;hb=bd06734362bb727b09b943688d9b69aa0a84590d;hpb=6eb39a03bf66d91c37ca5d14dd61a90850a921d3

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 51c1472..c26819f 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"
@@ -70,19 +71,19 @@ static char *cui_make_item_name(struct pmenu_item *i, struct cui_opt_data *cod)
 	char *name;
 
 	assert(cod->name);
-	assert(cod->kd);
+	assert(cod->bd);
 
 	name = talloc_asprintf(i, "%s:", cod->name);
 
-	if (cod->kd->image)
-		name = talloc_asprintf_append(name, " %s", cod->kd->image);
+	if (cod->bd->image)
+		name = talloc_asprintf_append(name, " %s", cod->bd->image);
 
-	if (cod->kd->initrd)
+	if (cod->bd->initrd)
 		name = talloc_asprintf_append(name, " initrd=%s",
-			cod->kd->initrd);
+			cod->bd->initrd);
 
-	if (cod->kd->args)
-		name = talloc_asprintf_append(name, " %s", cod->kd->args);
+	if (cod->bd->args)
+		name = talloc_asprintf_append(name, " %s", cod->bd->args);
 
 	DBGS("@%s@\n", name);
 	return name;
@@ -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, NULL, 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->kd->image);
-	nc_scr_status_printf(cui->current, "Failed: kexec %s", cod->kd->image);
-
 	return 0;
 }
 
@@ -165,7 +164,7 @@ static int cui_run_kexec(struct pmenu_item *item)
  */
 
 static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_editor_result boot_editor_result,
-	struct pb_kexec_data *kd)
+	struct pb_boot_data *bd)
 {
 	struct cui *cui = cui_from_arg(boot_editor->scr.ui_ctx);
 
@@ -174,11 +173,11 @@ static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_e
 		struct cui_opt_data *cod = cod_from_item(i);
 		char *name;
 
-		assert(kd);
+		assert(bd);
 
-		talloc_steal(i, kd);
-		talloc_free(cod->kd);
-		cod->kd = kd;
+		talloc_steal(i, bd);
+		talloc_free(cod->bd);
+		cod->bd = bd;
 
 		name = cui_make_item_name(i, cod);
 		pmenu_item_replace(i, name);
@@ -187,9 +186,9 @@ static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_e
 		set_current_item(cui->main->ncm, i->nci);
 
 		pb_log("%s: updating opt '%s'\n", __func__, cod->name);
-		pb_log(" image  '%s'\n", cod->kd->image);
-		pb_log(" initrd '%s'\n", cod->kd->initrd);
-		pb_log(" args   '%s'\n", cod->kd->args);
+		pb_log(" image  '%s'\n", cod->bd->image);
+		pb_log(" initrd '%s'\n", cod->bd->initrd);
+		pb_log(" args   '%s'\n", cod->bd->args);
 	}
 
 	cui_set_current(cui, &cui->main->scr);
@@ -203,7 +202,7 @@ int cui_boot_editor_run(struct pmenu_item *item)
 	struct cui_opt_data *cod = cod_from_item(item);
 	struct boot_editor *boot_editor;
 
-	boot_editor = boot_editor_init(cui, cod->kd, cui_boot_editor_on_exit);
+	boot_editor = boot_editor_init(cui, cod->bd, cui_boot_editor_on_exit);
 	cui_set_current(cui, &boot_editor->scr);
 
 	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,11 +329,11 @@ 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);
-	cod->kd = talloc_zero(i, struct pb_kexec_data);
+	cod->bd = talloc_zero(i, struct pb_boot_data);
 
 	pmenu_item_setup(menu, i, insert_pt, talloc_strdup(i, cod->name));
 
@@ -366,16 +354,18 @@ void cui_on_open(struct pmenu *menu)
  * menu_items into the main menu.  Redraws the main menu if it is active.
  */
 
-static int cui_device_add(struct device *dev, void *arg)
+static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
+		void *arg)
 {
 	struct cui *cui = cui_from_arg(arg);
-	int result;
-	struct boot_option *opt;
-	unsigned int o_count; /* device opts */
+	struct cui_opt_data *cod;
 	unsigned int insert_pt;
+	struct pmenu_item *i;
 	ITEM *selected;
+	char *name;
+	int result;
 
-	pb_log("%s: %p %s\n", __func__, dev, dev->id);
+	pb_log("%s: %p %s\n", __func__, opt, opt->id);
 
 	selected = current_item(cui->main->ncm);
 
@@ -389,57 +379,42 @@ static int cui_device_add(struct device *dev, void *arg)
 	if (result)
 		pb_log("%s: set_menu_items failed: %d\n", __func__, result);
 
-	o_count = 0;
-	list_for_each_entry(&dev->boot_options, opt, list)
-		o_count++;
-
 	/* Insert new items at insert_pt. */
+	insert_pt = pmenu_grow(cui->main, 1);
 
-	insert_pt = pmenu_grow(cui->main, o_count);
+	/* Save the item in opt->ui_info for cui_device_remove() */
 
-	list_for_each_entry(&dev->boot_options, opt, list) {
-		struct pmenu_item *i;
-		struct cui_opt_data *cod;
-		char *name;
-
-		/* Save the item in opt->ui_info for cui_device_remove() */
-
-		opt->ui_info = i = pmenu_item_alloc(cui->main);
-
-		i->on_edit = cui_boot_editor_run;
-		i->on_execute = cui_run_kexec;
-		i->data = cod = talloc(i, struct cui_opt_data);
-
-		cod->dev = dev;
-		cod->opt = opt;
-		cod->opt_hash = pb_opt_hash(dev, opt);
-		cod->name = opt->name;
-		cod->kd = talloc(i, struct pb_kexec_data);
-
-		cod->kd->image = talloc_strdup(cod->kd, opt->boot_image_file);
-		cod->kd->initrd = talloc_strdup(cod->kd, opt->initrd_file);
-		cod->kd->args = talloc_strdup(cod->kd, opt->boot_args);
-
-		name = cui_make_item_name(i, cod);
-		pmenu_item_setup(cui->main, i, insert_pt, name);
-
-		insert_pt++;
-
-		pb_log("%s: adding opt '%s'\n", __func__, cod->name);
-		pb_log("   image  '%s'\n", cod->kd->image);
-		pb_log("   initrd '%s'\n", cod->kd->initrd);
-		pb_log("   args   '%s'\n", cod->kd->args);
-
-		/* If this is the default_item select it and start timer. */
+	opt->ui_info = i = pmenu_item_alloc(cui->main);
 
-		if (cod->opt_hash == cui->default_item) {
-			selected = i->nci;
-			ui_timer_kick(&cui->timer);
-		}
+	i->on_edit = cui_boot_editor_run;
+	i->on_execute = cui_boot;
+	i->data = cod = talloc(i, struct cui_opt_data);
+
+	cod->opt = opt;
+	cod->dev = dev;
+	cod->opt_hash = pb_opt_hash(dev, opt);
+	cod->name = opt->name;
+	cod->bd = talloc(i, struct pb_boot_data);
+
+	cod->bd->image = talloc_strdup(cod->bd, opt->boot_image_file);
+	cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
+	cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
+
+	name = cui_make_item_name(i, cod);
+	pmenu_item_setup(cui->main, i, insert_pt, name);
+
+	pb_log("%s: adding opt '%s'\n", __func__, cod->name);
+	pb_log("   image  '%s'\n", cod->bd->image);
+	pb_log("   initrd '%s'\n", cod->bd->initrd);
+	pb_log("   args   '%s'\n", cod->bd->args);
+
+	/* If this is the default_item select it and start timer. */
+	if (cod->opt_hash == cui->default_item) {
+		selected = i->nci;
+		ui_timer_kick(&cui->timer);
 	}
 
 	/* Re-attach the items array. */
-
 	result = set_menu_items(cui->main->ncm, cui->main->items);
 
 	if (result)
@@ -518,7 +493,8 @@ static void cui_device_remove(struct device *dev, void *arg)
 }
 
 static struct discover_client_ops cui_client_ops = {
-	.device_add = cui_device_add,
+	.device_add = NULL,
+	.boot_option_add = cui_boot_option_add,
 	.device_remove = cui_device_remove,
 };
 
@@ -533,11 +509,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 +524,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 +557,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 +569,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);