}
/**
- * 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);
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;
}
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.
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);
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;
*/
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)
{
struct cui *cui;
- struct discover_client *client;
unsigned int i;
cui = talloc_zero(NULL, struct cui);
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);
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;
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__);
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);