* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if defined(HAVE_CONFIG_H)
#include "config.h"
-
-#define _GNU_SOURCE
+#endif
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <locale.h>
#include <sys/ioctl.h>
+#include <sys/reboot.h>
#include "log/log.h"
#include "pb-protocol/pb-protocol.h"
#include "talloc/talloc.h"
#include "waiter/waiter.h"
#include "process/process.h"
+#include "i18n/i18n.h"
#include "ui/common/discover-client.h"
#include "ui/common/ui-system.h"
#include "nc-cui.h"
#include "nc-boot-editor.h"
#include "nc-config.h"
+#include "nc-add-url.h"
#include "nc-sysinfo.h"
+#include "nc-lang.h"
+#include "nc-helpscreen.h"
+#include "nc-statuslog.h"
+#include "nc-subset.h"
+
+extern const struct help_text main_menu_help_text;
+
+static bool cui_detached = false;
+
+static struct pmenu *main_menu_init(struct cui *cui);
+
+static bool lockdown_active(void)
+{
+ bool lockdown = false;
+ if (access(LOCKDOWN_FILE, F_OK) != -1)
+ lockdown = true;
+ return lockdown;
+}
static void cui_start(void)
{
define_key("\x7f", KEY_BACKSPACE);
define_key("\x08", KEY_BACKSPACE);
+ /* we need backtab too, for form navigation. vt220 doesn't include
+ * this (kcbt), but we don't want to require a full linux/xterm termcap
+ */
+ define_key("\x1b[Z", KEY_BTAB);
+
+ /* We'll define a few other keys too since they're commonly
+ * used for navigation but the escape character will cause
+ * 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);
+ define_key("\x1b\x5b\x33\x7e", KEY_DC);
+
while (getch() != ERR) /* flush stdin */
(void)0;
}
static void cui_atexit(void)
{
+ if (cui_detached)
+ return;
+
clear();
refresh();
endwin();
+
+ bool lockdown = lockdown_active();
+
+ while (lockdown) {
+ sync();
+ reboot(RB_AUTOBOOT);
+ }
}
/**
struct cui *cui = cui_from_item(item);
const char **cmd_argv = item->data;
- nc_scr_status_printf(cui->current, "Running %s...", cmd_argv[0]);
+ nc_scr_status_printf(cui->current, _("Running %s..."), cmd_argv[0]);
def_prog_mode();
if (result) {
pb_log("%s: failed: '%s'\n", __func__, cmd_argv[0]);
- nc_scr_status_printf(cui->current, "Failed: %s", cmd_argv[0]);
+ nc_scr_status_printf(cui->current, _("Failed: %s"),
+ cmd_argv[0]);
}
return result;
pb_debug("%s: %s\n", __func__, cod->name);
- nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
+ nc_scr_status_printf(cui->current, _("Booting %s..."), cod->name);
result = discover_client_boot(cui->client, NULL, cod->opt, cod->bd);
if (result) {
nc_scr_status_printf(cui->current,
- "Failed: boot %s", cod->bd->image);
+ _("Failed: boot %s"), cod->bd->image);
}
return 0;
{
struct pmenu *menu = cui->main;
struct cui_opt_data *cod;
+ int idx, top, rows, cols;
+ static int user_idx = 0;
/* Was the edit cancelled? */
if (!bd) {
if (!item) {
int insert_pt;
+ cod = talloc_zero(NULL, struct cui_opt_data);
+ cod->name = talloc_asprintf(cod, _("User item %u"), ++user_idx);
+
+ item = pmenu_item_create(menu, cod->name);
+ if (!item) {
+ talloc_free(cod);
+ goto out;
+ }
+
+ item->on_edit = cui_item_edit;
+ item->on_execute = cui_boot;
+ item->data = cod;
+
+ talloc_steal(item, cod);
+
/* Detach the items array. */
set_menu_items(menu->ncm, NULL);
/* Insert new item at insert_pt. */
insert_pt = pmenu_grow(menu, 1);
- item = pmenu_item_alloc(menu);
- item->on_edit = cui_item_edit;
- item->on_execute = cui_boot;
- item->data = cod = talloc_zero(item, struct cui_opt_data);
-
- cod->name = talloc_asprintf(cod, "User item %u:", insert_pt);
- pmenu_item_setup(menu, item, insert_pt,
- talloc_strdup(item, cod->name));
+ pmenu_item_insert(menu, item, insert_pt);
/* Re-attach the items array. */
set_menu_items(menu->ncm, menu->items);
+
+ /* If our index is above the current top row, align
+ * us to the new top. Otherwise, align us to the new
+ * bottom */
+ menu_format(cui->main->ncm, &rows, &cols);
+ top = top_row(cui->main->ncm);
+ idx = item_index(item->nci);
+
+ if (top >= idx)
+ top = idx;
+ else
+ top = idx < rows ? 0 : idx - rows + 1;
+
+ set_top_row(cui->main->ncm, top);
+ set_current_item(item->pmenu->ncm, item->nci);
+
nc_scr_post(&menu->scr);
} else {
cod = item->data;
cod->bd = talloc_steal(cod, bd);
- set_current_item(item->pmenu->ncm, item->nci);
+out:
cui_set_current(cui, &cui->main->scr);
talloc_free(cui->boot_editor);
cui->boot_editor = NULL;
cui_set_current(cui, config_screen_scr(cui->config_screen));
}
+static void cui_lang_exit(struct cui *cui)
+{
+ cui_set_current(cui, &cui->main->scr);
+ talloc_free(cui->lang_screen);
+ cui->lang_screen = NULL;
+}
+
+void cui_show_lang(struct cui *cui)
+{
+ cui->lang_screen = lang_screen_init(cui, cui->config, cui_lang_exit);
+ cui_set_current(cui, lang_screen_scr(cui->lang_screen));
+}
+
+static void cui_statuslog_exit(struct cui *cui)
+{
+ cui_set_current(cui, &cui->main->scr);
+ talloc_free(cui->statuslog_screen);
+ cui->statuslog_screen = NULL;
+}
+
+void cui_show_statuslog(struct cui *cui)
+{
+ cui->statuslog_screen = statuslog_screen_init(cui, cui_statuslog_exit);
+ cui_set_current(cui, statuslog_screen_scr(cui->statuslog_screen));
+}
+
+static void cui_add_url_exit(struct cui *cui)
+{
+ cui_set_current(cui, &cui->main->scr);
+ talloc_free(cui->add_url_screen);
+ cui->add_url_screen = NULL;
+}
+
+void cui_show_add_url(struct cui *cui)
+{
+ cui->add_url_screen = add_url_screen_init(cui, cui_add_url_exit);
+ cui_set_current(cui, add_url_screen_scr(cui->add_url_screen));
+}
+
+static void cui_help_exit(struct cui *cui)
+{
+ cui_set_current(cui, help_screen_return_scr(cui->help_screen));
+ talloc_free(cui->help_screen);
+ cui->help_screen = NULL;
+}
+
+void cui_show_help(struct cui *cui, const char *title,
+ const struct help_text *text)
+{
+ if (!cui->current)
+ return;
+
+ if (cui->help_screen)
+ return;
+
+ cui->help_screen = help_screen_init(cui, cui->current,
+ title, text, cui_help_exit);
+
+ if (cui->help_screen)
+ cui_set_current(cui, help_screen_scr(cui->help_screen));
+}
+
+static void cui_subset_exit(struct cui *cui)
+{
+ cui_set_current(cui, subset_screen_return_scr(cui->subset_screen));
+ talloc_free(cui->subset_screen);
+ cui->subset_screen = NULL;
+}
+
+void cui_show_subset(struct cui *cui, const char *title,
+ void *arg)
+{
+ if (!cui->current)
+ return;
+
+ if (cui->subset_screen)
+ return;
+
+ cui->subset_screen = subset_screen_init(cui, cui->current,
+ title, arg, cui_subset_exit);
+
+ if (cui->subset_screen)
+ cui_set_current(cui, subset_screen_scr(cui->subset_screen));
+}
+
/**
* cui_set_current - Set the currently active screen and redraw it.
*/
assert(cui->current);
- if (!cui->has_input)
- discover_client_cancel_default(cui->client);
- cui->has_input = true;
-
for (;;) {
int c = getch();
if (c == ERR)
break;
+ if (!cui->has_input) {
+ cui->has_input = true;
+ if (cui->client) {
+ pb_log("UI input received (key = %d), aborting "
+ "default boot\n", c);
+ discover_client_cancel_default(cui->client);
+ } else {
+ pb_log("UI input received (key = %d), aborting "
+ "once server connects\n", c);
+ }
+ }
+
if (process_global_keys(cui, c))
continue;
static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
void *arg)
{
+ struct pmenu_item *i, *dev_hdr = NULL;
struct cui *cui = cui_from_arg(arg);
struct cui_opt_data *cod;
+ const char *tab = " ";
unsigned int insert_pt;
- struct pmenu_item *i;
+ int result, rows, cols;
ITEM *selected;
- int result;
+ char *name;
pb_debug("%s: %p %s\n", __func__, opt, opt->id);
selected = current_item(cui->main->ncm);
+ menu_format(cui->main->ncm, &rows, &cols);
if (cui->current == &cui->main->scr)
nc_scr_unpost(cui->current);
- /* This disconnects items array from menu. */
-
- result = set_menu_items(cui->main->ncm, NULL);
+ /* Check if the boot device is new */
+ dev_hdr = pmenu_find_device(cui->main, dev, opt);
- if (result)
- pb_log("%s: set_menu_items failed: %d\n", __func__, result);
-
- /* Insert new items at insert_pt. */
- insert_pt = pmenu_grow(cui->main, 1);
+ /* All actual boot entries are 'tabbed' across */
+ name = talloc_asprintf(cui->main, "%s%s",
+ tab, opt->name ? : "Unknown Name");
/* Save the item in opt->ui_info for cui_device_remove() */
-
- opt->ui_info = i = pmenu_item_alloc(cui->main);
+ opt->ui_info = i = pmenu_item_create(cui->main, name);
+ talloc_free(name);
+ if (!i)
+ return -1;
i->on_edit = cui_item_edit;
i->on_execute = cui_boot;
cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
cod->bd->dtb = talloc_strdup(cod->bd, opt->dtb_file);
cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
+ cod->bd->args_sig_file = talloc_strdup(cod->bd, opt->args_sig_file);
- pmenu_item_setup(cui->main, i, insert_pt, cod->name);
+ /* This disconnects items array from menu. */
+ result = set_menu_items(cui->main->ncm, NULL);
+
+ if (result)
+ pb_log("%s: set_menu_items failed: %d\n", __func__, result);
+
+ /* Insert new items at insert_pt. */
+ if (dev_hdr) {
+ insert_pt = pmenu_grow(cui->main, 2);
+ pmenu_item_insert(cui->main, dev_hdr, insert_pt);
+ pb_log("%s: adding new device hierarchy %s\n",
+ __func__,opt->device_id);
+ pmenu_item_insert(cui->main, i, insert_pt+1);
+ } else {
+ insert_pt = pmenu_grow(cui->main, 1);
+ pmenu_item_add(cui->main, i, insert_pt);
+ }
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);
+ pb_log(" argsig '%s'\n", cod->bd->args_sig_file);
/* Re-attach the items array. */
result = set_menu_items(cui->main->ncm, cui->main->items);
item_count(cui->main->ncm) + 1);
}
- /* FIXME: need to make item visible somehow */
- menu_driver(cui->main->ncm, REQ_SCR_UPAGE);
- menu_driver(cui->main->ncm, REQ_SCR_DPAGE);
- set_current_item(cui->main->ncm, selected);
+ if (!item_visible(selected)) {
+ int idx, top;
+
+ top = top_row(cui->main->ncm);
+ idx = item_index(selected);
+
+ /* If our index is above the current top row, align
+ * us to the new top. Otherwise, align us to the new
+ * bottom */
+ top = top < idx ? idx - rows + 1 : idx;
+
+ set_top_row(cui->main->ncm, top);
+ set_current_item(cui->main->ncm, selected);
+ }
if (cui->current == &cui->main->scr)
nc_scr_post(cui->current);
static void cui_device_remove(struct device *dev, void *arg)
{
struct cui *cui = cui_from_arg(arg);
- int result;
struct boot_option *opt;
+ unsigned int i;
+ int rows, cols, top, last;
+ int result;
pb_log("%s: %p %s\n", __func__, dev, dev->id);
pb_log("%s: set_menu_items failed: %d\n", __func__, result);
list_for_each_entry(&dev->boot_options, opt, list) {
- struct pmenu_item *i = pmenu_item_from_arg(opt->ui_info);
+ struct pmenu_item *item = pmenu_item_from_arg(opt->ui_info);
- assert(pb_protocol_device_cmp(dev, cod_from_item(i)->dev));
- pmenu_remove(cui->main, i);
+ assert(pb_protocol_device_cmp(dev, cod_from_item(item)->dev));
+ pmenu_remove(cui->main, item);
+ }
+
+ /* Manually remove remaining device hierarchy item */
+ for (i=0; i < cui->main->item_count; i++) {
+ struct pmenu_item *item = item_userptr(cui->main->items[i]);
+ if (!item || !item->data )
+ continue;
+
+ struct cui_opt_data *data = item->data;
+ if (data && data->dev && data->dev == dev)
+ pmenu_remove(cui->main,item);
}
/* Re-attach the items array. */
result = set_menu_items(cui->main->ncm, cui->main->items);
+ /* Move cursor to 'Exit' menu entry */
+ menu_format(cui->main->ncm, &rows, &cols);
+ last = cui->main->item_count - 1;
+ set_current_item(cui->main->ncm, cui->main->items[last]);
+ if (!item_visible(cui->main->items[last])) {
+ top = last < rows ? 0 : last - rows + 1;
+ set_top_row(cui->main->ncm, top);
+ }
+
if (result)
pb_log("%s: set_menu_items failed: %d\n", __func__, result);
nc_scr_post(cui->current);
}
-static void cui_update_status(struct boot_status *status, void *arg)
+static void cui_update_status(struct 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);
+ statuslog_append_steal(cui, cui->statuslog, status);
+ nc_scr_status_printf(cui->current, "%s", status->message);
}
static void cui_update_mm_title(struct cui *cui)
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);
cui_update_mm_title(cui);
}
+static void cui_update_language(struct cui *cui, char *lang)
+{
+ bool repost_menu;
+ char *cur_lang;
+
+ cur_lang = setlocale(LC_ALL, NULL);
+ if (cur_lang && !strcmp(cur_lang, lang))
+ return;
+
+ setlocale(LC_ALL, lang);
+
+ /* we'll need to update the menu: drop all items and repopulate */
+ repost_menu = cui->current == &cui->main->scr;
+ if (repost_menu)
+ nc_scr_unpost(cui->current);
+
+ talloc_free(cui->main);
+ cui->main = main_menu_init(cui);
+
+ if (repost_menu) {
+ cui->current = &cui->main->scr;
+ nc_scr_post(cui->current);
+ }
+
+ discover_client_enumerate(cui->client);
+}
+
static void cui_update_config(struct config *config, void *arg)
{
struct cui *cui = cui_from_arg(arg);
cui->config = talloc_steal(cui, config);
+ 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);
+
+ if (config->safe_mode)
+ nc_scr_status_printf(cui->current,
+ _("SAFE MODE: select '%s' to continue"),
+ _("Rescan devices"));
}
int cui_send_config(struct cui *cui, struct config *config)
return discover_client_send_config(cui->client, config);
}
+int cui_send_url(struct cui *cui, char * url)
+{
+ return discover_client_send_url(cui->client, url);
+}
+
+void cui_send_reinit(struct cui *cui)
+{
+ discover_client_send_reinit(cui->client);
+}
+
+static int menu_sysinfo_execute(struct pmenu_item *item)
+{
+ cui_show_sysinfo(cui_from_item(item));
+ return 0;
+}
+
+static int menu_config_execute(struct pmenu_item *item)
+{
+ cui_show_config(cui_from_item(item));
+ return 0;
+}
+
+static int menu_lang_execute(struct pmenu_item *item)
+{
+ cui_show_lang(cui_from_item(item));
+ return 0;
+}
+
+static int menu_statuslog_execute(struct pmenu_item *item)
+{
+ cui_show_statuslog(cui_from_item(item));
+ return 0;
+}
+
+static int menu_reinit_execute(struct pmenu_item *item)
+{
+ if (cui_from_item(item)->client)
+ cui_send_reinit(cui_from_item(item));
+ return 0;
+}
+
+static int menu_add_url_execute(struct pmenu_item *item)
+{
+ if (cui_from_item(item)->client)
+ cui_show_add_url(cui_from_item(item));
+ return 0;
+}
+
+/**
+ * pb_mm_init - Setup the main menu instance.
+ */
+static struct pmenu *main_menu_init(struct cui *cui)
+{
+ struct pmenu_item *i;
+ struct pmenu *m;
+ int result;
+ bool lockdown = lockdown_active();
+
+ m = pmenu_init(cui, 8, cui_on_exit);
+ if (!m) {
+ pb_log("%s: failed\n", __func__);
+ return NULL;
+ }
+
+ m->on_new = cui_item_new;
+
+ m->scr.frame.ltitle = talloc_asprintf(m,
+ "Petitboot (" PACKAGE_VERSION ")");
+ m->scr.frame.rtitle = NULL;
+ m->scr.frame.help = talloc_strdup(m,
+ _("Enter=accept, e=edit, n=new, x=exit, l=language, g=log, h=help"));
+ m->scr.frame.status = talloc_strdup(m, _("Welcome to Petitboot"));
+
+ /* add a separator */
+ i = pmenu_item_create(m, " ");
+ item_opts_off(i->nci, O_SELECTABLE);
+ pmenu_item_insert(m, i, 0);
+
+ /* add system items */
+ i = pmenu_item_create(m, _("System information"));
+ i->on_execute = menu_sysinfo_execute;
+ pmenu_item_insert(m, i, 1);
+
+ i = pmenu_item_create(m, _("System configuration"));
+ i->on_execute = menu_config_execute;
+ pmenu_item_insert(m, i, 2);
+
+ i = pmenu_item_create(m, _("System status log"));
+ i->on_execute = menu_statuslog_execute;
+ pmenu_item_insert(m, i, 3);
+
+ /* this label isn't translated, so we don't want a gettext() here */
+ i = pmenu_item_create(m, "Language");
+ i->on_execute = menu_lang_execute;
+ pmenu_item_insert(m, i, 4);
+
+ i = pmenu_item_create(m, _("Rescan devices"));
+ i->on_execute = menu_reinit_execute;
+ pmenu_item_insert(m, i, 5);
+
+ i = pmenu_item_create(m, _("Retrieve config from URL"));
+ i->on_execute = menu_add_url_execute;
+ pmenu_item_insert(m, i, 6);
+
+ if (lockdown)
+ i = pmenu_item_create(m, _("Reboot"));
+ else
+ i = pmenu_item_create(m, _("Exit to shell"));
+ i->on_execute = pmenu_exit_cb;
+ pmenu_item_insert(m, i, 7);
+
+ result = pmenu_setup(m);
+
+ if (result) {
+ pb_log("%s:%d: pmenu_setup failed: %s\n", __func__, __LINE__,
+ strerror(errno));
+ goto fail_setup;
+ }
+
+ m->help_title = _("main menu");
+ m->help_text = &main_menu_help_text;
+
+ menu_opts_off(m->ncm, O_SHOWDESC);
+ set_menu_mark(m->ncm, " *");
+ set_current_item(m->ncm, i->nci);
+
+ return m;
+
+fail_setup:
+ talloc_free(m);
+ return NULL;
+}
+
static struct discover_client_ops cui_client_ops = {
.device_add = NULL,
.boot_option_add = cui_boot_option_add,
.update_config = cui_update_config,
};
+/* cui_server_wait_on_exit - On exit spin until the server is available.
+ *
+ * If the program exits before connecting to the server autoboot won't be
+ * cancelled even though there has been keyboard activity. This function is
+ * called by a child process which will spin until the server is connected and
+ * told to cancel autoboot.
+ *
+ * Processes exiting from this function will not carry out the cui_atexit()
+ * steps.
+ */
+static void cui_server_wait_on_exit(struct cui *cui)
+{
+ cui_detached = true;
+
+ while (!cui->client) {
+ cui->client = discover_client_init(cui->waitset,
+ &cui_client_ops, cui);
+ if (!cui->client)
+ sleep(1);
+ }
+
+ talloc_steal(cui, cui->client);
+ discover_client_cancel_default(cui->client);
+}
+
+/* cui_server_wait - Connect to the discover server.
+ * @arg: Pointer to the cui instance.
+ *
+ * A timeout callback that attempts to connect to the discover server; on
+ * failure it registers itself with a one second timeout to try again.
+ * On success the cui->client struct will be set.
+ *
+ * Since this updates the status line when called it must not be called
+ * before the UI is ready.
+ */
+static int cui_server_wait(void *arg)
+{
+ struct cui *cui = cui_from_arg(arg);
+
+ if (cui->client) {
+ pb_debug("We already have a server!\n");
+ return 0;
+ }
+
+ /* We haven't yet connected to the server */
+ pb_log("Trying to connect...\n");
+ cui->client = discover_client_init(cui->waitset,
+ &cui_client_ops, cui);
+
+ if (!cui->client) {
+ waiter_register_timeout(cui->waitset, 1000, cui_server_wait,
+ cui);
+ nc_scr_status_printf(cui->current,
+ "Info: Waiting for device discovery");
+ } else {
+ nc_scr_status_printf(cui->current,
+ "Info: Connected to pb-discover!");
+ talloc_steal(cui, cui->client);
+
+ if (cui->has_input) {
+ pb_log("Aborting default boot on pb-discover connect\n");
+ discover_client_cancel_default(cui->client);
+ }
+ }
+
+ return 0;
+}
+
/**
* cui_init - Setup the cui instance.
* @platform_info: A value for the struct cui platform_info member.
*/
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, int timeout)
{
struct cui *cui;
unsigned int i;
cui = talloc_zero(NULL, struct cui);
-
if (!cui) {
pb_log("%s: alloc cui failed.\n", __func__);
- fprintf(stderr, "%s: alloc cui failed.\n", __func__);
+ fprintf(stderr, _("%s: alloc cui failed.\n"), __func__);
goto fail_alloc;
}
cui->c_sig = pb_cui_sig;
cui->platform_info = platform_info;
cui->waitset = waitset_create(cui);
+ cui->statuslog = statuslog_init(cui);
process_init(cui, cui->waitset, false);
- setlocale(LC_ALL, "");
-
/* 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 && timeout; i--) {
cui->client = discover_client_init(cui->waitset,
&cui_client_ops, cui);
if (cui->client || !i)
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);
goto retry_start;
pb_log("%s: discover_client_init failed.\n", __func__);
- fprintf(stderr, "%s: error: discover_client_init failed.\n",
+ fprintf(stderr, _("%s: error: discover_client_init failed.\n"),
__func__);
- fprintf(stderr, "could not start pb-discover, the petitboot "
- "daemon.\n");
+ fprintf(stderr, _("could not start pb-discover, the petitboot "
+ "daemon.\n"));
goto fail_client_init;
}
- if (!cui->client) {
+ if (!cui->client && !timeout) {
+ /* Have the first timeout fire immediately so we can check
+ * for the server as soon as the UI is ready */
+ waiter_register_timeout(cui->waitset, 0,
+ cui_server_wait, cui);
+ } else if (!cui->client) {
pb_log("%s: discover_client_init failed.\n", __func__);
- fprintf(stderr, "%s: error: discover_client_init failed.\n",
+ fprintf(stderr, _("%s: error: discover_client_init failed.\n"),
__func__);
- fprintf(stderr, "check that pb-discover, "
- "the petitboot daemon is running.\n");
+ fprintf(stderr, _("check that pb-discover, "
+ "the petitboot daemon is running.\n"));
goto fail_client_init;
}
atexit(cui_atexit);
+ talloc_steal(cui, cui->client);
cui_start();
+ cui->main = main_menu_init(cui);
+ if (!cui->main)
+ goto fail_client_init;
+
waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
cui_process_key, cui);
* Returns 0 on success (return to shell), -1 on error (should restart).
*/
-int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item)
+int cui_run(struct cui *cui)
{
+ pid_t pid;
+
assert(main);
- cui->main = main;
cui->current = &cui->main->scr;
- cui->default_item = default_item;
+ cui->default_item = 0;
nc_scr_post(cui->current);
cui_atexit();
+ if (!cui->client) {
+ /* Fork a child to tell the server to cancel autoboot */
+ pid = fork();
+ if (!pid) {
+ cui_server_wait_on_exit(cui);
+ exit(EXIT_SUCCESS);
+ }
+ if (pid < 0)
+ pb_log("Failed to fork child on exit: %m\n");
+ }
+
return cui->abort ? 0 : -1;
}
projects / petitboot / blobdiff