#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"
cui->resize = 1;
}
+/**
+ * cui_make_item_name - Format the menu item name srting.
+ *
+ * Returns a talloc string.
+ */
+
+static char *cui_make_item_name(struct pmenu_item *i, struct cui_opt_data *cod)
+{
+ char *name;
+
+ assert(cod->name);
+ assert(cod->bd);
+
+ name = talloc_asprintf(i, "%s:", cod->name);
+
+ if (cod->bd->image)
+ name = talloc_asprintf_append(name, " %s", cod->bd->image);
+
+ if (cod->bd->initrd)
+ name = talloc_asprintf_append(name, " initrd=%s",
+ cod->bd->initrd);
+
+ if (cod->bd->args)
+ name = talloc_asprintf_append(name, " %s", cod->bd->args);
+
+ DBGS("@%s@\n", name);
+ return name;
+}
+
/**
* cui_on_exit - A generic main menu ESC callback.
*/
def_prog_mode();
- result = pb_run_cmd(cmd_argv);
+ result = pb_run_cmd(cmd_argv, 1, 0);
reset_prog_mode();
redrawwin(cui->current->main_ncw);
}
/**
- * 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);
- if (!result) {
- clear();
- mvaddstr(1, 0, "system is going down now...");
- refresh();
- sleep(60);
+ if (result) {
+ 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;
}
/**
- * cui_ked_on_exit - The ked on_exit callback.
+ * cui_boot_editor_on_exit - The boot_editor on_exit callback.
*/
-static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
- struct pb_kexec_data *kd)
+static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_editor_result boot_editor_result,
+ struct pb_boot_data *bd)
{
- struct cui *cui = cui_from_arg(ked->scr.ui_ctx);
+ struct cui *cui = cui_from_arg(boot_editor->scr.ui_ctx);
- if (ked_result == ked_update || ked_result == ked_boot) {
+ if (boot_editor_result == boot_editor_update) {
struct pmenu_item *i = pmenu_find_selected(cui->main);
struct cui_opt_data *cod = cod_from_item(i);
+ char *name;
+
+ assert(bd);
+
+ talloc_steal(i, bd);
+ talloc_free(cod->bd);
+ cod->bd = bd;
- assert(kd);
+ name = cui_make_item_name(i, cod);
+ pmenu_item_replace(i, name);
- talloc_steal(i, kd);
- talloc_free(cod->kd);
- cod->kd = kd;
+ /* FIXME: need to make item visible somehow */
+ 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);
- talloc_free(ked);
-
- if (ked_result == ked_boot) {
- struct pmenu_item *i = pmenu_find_selected(cui->main);
- i->on_execute(i);
- }
+ talloc_free(boot_editor);
}
-int cui_ked_run(struct pmenu_item *item)
+int cui_boot_editor_run(struct pmenu_item *item)
{
struct cui *cui = cui_from_item(item);
- struct ked *ked;
-
- ked = ked_init(cui, cod_from_item(item)->kd, cui_ked_on_exit);
+ struct cui_opt_data *cod = cod_from_item(item);
+ struct boot_editor *boot_editor;
- cui_set_current(cui, &ked->scr);
+ boot_editor = boot_editor_init(cui, cod->bd, cui_boot_editor_on_exit);
+ cui_set_current(cui, &boot_editor->scr);
return 0;
}
return old;
}
+/**
+ * cui_process_key - Process input on stdin.
+ */
+
static int cui_process_key(void *arg)
{
struct cui *cui = cui_from_arg(arg);
}
/**
- * cui_client_process_socket - Process a socket event from the discover server.
+ * cui_process_js - Process joystick events.
*/
-static int cui_client_process_socket(void *arg)
+static int cui_process_js(void *arg)
{
- struct discover_client *client = arg;
+ struct cui *cui = cui_from_arg(arg);
+ int c;
+
+ c = pjs_process_event(cui->pjs);
+
+ if (c) {
+ ungetch(c);
+ cui_process_key(arg);
+ }
- discover_client_process(client);
return 0;
}
unsigned int insert_pt;
struct pmenu_item *i;
struct cui_opt_data *cod;
- char *name;
menu->scr.unpost(&menu->scr);
insert_pt = pmenu_grow(menu, 1);
i = pmenu_item_alloc(menu);
- name = talloc_asprintf(i, "User item %u:", insert_pt);
- pmenu_item_setup(menu, i, insert_pt, name, NULL);
-
- i->on_edit = cui_ked_run;
- i->on_execute = cui_run_kexec;
+ i->on_edit = cui_boot_editor_run;
+ i->on_execute = cui_boot;
i->data = cod = talloc_zero(i, struct cui_opt_data);
- cod->kd = talloc_zero(i, struct pb_kexec_data);
- cod->name = name;
+ cod->name = talloc_asprintf(i, "User item %u:", insert_pt);
+ cod->bd = talloc_zero(i, struct pb_boot_data);
+
+ pmenu_item_setup(menu, i, insert_pt, talloc_strdup(i, cod->name));
/* Re-attach the items array. */
set_menu_items(menu->ncm, menu->items);
- set_current_item(menu->ncm, i->nci);
menu->scr.post(&menu->scr);
- pos_menu_cursor(menu->ncm);
+ set_current_item(menu->ncm, i->nci);
i->on_edit(i);
}
* 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);
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);
-
- list_for_each_entry(&dev->boot_options, opt, list) {
- struct pmenu_item *i;
- struct cui_opt_data *cod;
- char *name;
- char *description;
-
- /* Save the item in opt->ui_info for cui_device_remove() */
-
- opt->ui_info = i = pmenu_item_alloc(cui->main);
-
- name = talloc_asprintf(i, "%s: %s", opt->name,
- opt->description);
-
- description = talloc_asprintf(i,
- " kexec: image='%s' initrd='%s' args='%s'",
- opt->boot_image_file,
- opt->initrd_file,
- opt->boot_args);
+ /* Save the item in opt->ui_info for cui_device_remove() */
- pmenu_item_setup(cui->main, i, insert_pt, name, description);
+ opt->ui_info = i = pmenu_item_alloc(cui->main);
- i->on_edit = cui_ked_run;
- i->on_execute = cui_run_kexec;
- i->data = cod = talloc(i, struct cui_opt_data);
+ i->on_edit = cui_boot_editor_run;
+ i->on_execute = cui_boot;
+ 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->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->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);
+ 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);
- insert_pt++;
+ 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->kd->image);
- pb_log(" initrd '%s'\n", cod->kd->initrd);
- pb_log(" args '%s'\n", cod->kd->args);
+ 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);
- }
+ /* 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)
cui->current->post(cui->current);
}
+static void cui_update_status(struct boot_status *status, void *arg)
+{
+ struct cui *cui = cui_from_arg(arg);
+
+ nc_scr_status_printf(cui->current,
+ "%s: %s",
+ status->type == BOOT_STATUS_ERROR ? "Error" : "Info",
+ status->message);
+
+}
+
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,
+ .update_status = cui_update_status,
};
/**
*/
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)
{
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->waitset = waitset_create(cui);
/* Loop here for scripts that just started the server. */
- for (i = 10; i; i--) {
- client = discover_client_init(&cui_client_ops, cui);
- if (client)
+retry_start:
+ for (i = start_deamon ? 2 : 10; i; 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) {
+ if (!cui->client && start_deamon) {
+ int result;
+
+ start_deamon = 0;
+
+ result = pb_start_daemon();
+
+ if (!result)
+ goto retry_start;
+
+ pb_log("%s: discover_client_init failed.\n", __func__);
+ fprintf(stderr, "%s: error: discover_client_init failed.\n",
+ __func__);
+ fprintf(stderr, "could not start pb-discover, the petitboot "
+ "daemon.\n");
+ goto fail_client_init;
+ }
+
+ 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(discover_client_get_fd(client), WAIT_IN,
- cui_client_process_socket, client);
+ waiter_register(cui->waitset, STDIN_FILENO, WAIT_IN,
+ cui_process_key, cui);
+
+ if (js_map) {
- waiter_register(STDIN_FILENO, WAIT_IN, cui_process_key, cui);
+ cui->pjs = pjs_init(cui, js_map);
+
+ if (cui->pjs)
+ waiter_register(cui->waitset, pjs_get_fd(cui->pjs),
+ WAIT_IN, cui_process_js, cui);
+ }
return cui;
cui->current->post(cui->current);
while (1) {
- int result = waiter_poll();
+ int result = waiter_poll(cui->waitset);
if (result < 0 && errno != EINTR) {
pb_log("%s: poll: %s\n", __func__, strerror(errno));
projects / petitboot / blobdiff