X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=5c0f23bd88d284ff962ed70aa4571c19d01bb215;hp=24aac2b6e8d6f7fc61e2e271104e9802b9225e6d;hb=fb8dbd274b4b2c4df52d09d2fe303ccdacdf546b;hpb=d8d5dac0fcd80276b71184060e771804fb67d7c9 diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c index 24aac2b..5c0f23b 100644 --- a/ui/ncurses/nc-config.c +++ b/ui/ncurses/nc-config.c @@ -33,7 +33,7 @@ #include "nc-config.h" #include "nc-widgets.h" -#define N_FIELDS 42 +#define N_FIELDS 48 extern struct help_text config_help_text; @@ -67,6 +67,7 @@ struct config_screen { bool autoboot_enabled; bool ipmi_override; + bool net_override; struct { struct nc_widget_label *autoboot_l; @@ -83,7 +84,7 @@ struct config_screen { struct nc_widget_label *ipmi_type_l; struct nc_widget_label *ipmi_clear_l; - struct nc_widget_checkbox *ipmi_clear_cb; + struct nc_widget_button *ipmi_clear_b; struct nc_widget_label *network_l; struct nc_widget_select *network_f; @@ -105,13 +106,19 @@ struct config_screen { struct nc_widget_textbox *dns_f; struct nc_widget_label *dns_dhcp_help_l; struct nc_widget_label *dns_help_l; + struct nc_widget_label *http_proxy_l; + struct nc_widget_textbox *http_proxy_f; + struct nc_widget_label *https_proxy_l; + struct nc_widget_textbox *https_proxy_f; struct nc_widget_label *allow_write_l; struct nc_widget_select *allow_write_f; - struct nc_widget_label *boot_tty_l; - struct nc_widget_select *boot_tty_f; - struct nc_widget_label *current_tty_l; + struct nc_widget_label *boot_console_l; + struct nc_widget_select *boot_console_f; + struct nc_widget_label *manual_console_l; + struct nc_widget_label *current_console_l; + struct nc_widget_label *net_override_l; struct nc_widget_label *safe_mode; struct nc_widget_button *ok_b; struct nc_widget_button *help_b; @@ -196,11 +203,11 @@ static int screen_process_form(struct config_screen *screen) const struct system_info *sysinfo = screen->cui->sysinfo; enum net_conf_type net_conf_type; struct interface_config *iface; - bool allow_write, autoboot; + bool allow_write; char *str, *end; struct config *config; - int i, n_boot_opts, rc, idx; - unsigned int *order, tty; + int i, n_boot_opts, rc; + unsigned int *order, idx; char mac[20]; config = config_copy(screen, screen->cui->config); @@ -211,8 +218,8 @@ static int screen_process_form(struct config_screen *screen) n_boot_opts = widget_subset_get_order(config, &order, screen->widgets.boot_order_f); - autoboot = widget_select_get_value(screen->widgets.autoboot_f); - config->autoboot_enabled = autoboot && n_boot_opts; + config->autoboot_enabled = widget_select_get_value( + screen->widgets.autoboot_f); config->n_autoboot_opts = n_boot_opts; config->autoboot_opts = talloc_array(config, struct autoboot_option, @@ -249,11 +256,6 @@ static int screen_process_form(struct config_screen *screen) config->autoboot_timeout_sec = x; } - if (screen->ipmi_override) - if (widget_checkbox_get_value(screen->widgets.ipmi_clear_cb)) - config->ipmi_bootdev = IPMI_BOOTDEV_INVALID; - - net_conf_type = widget_select_get_value(screen->widgets.network_f); /* if we don't have any network interfaces, prevent per-interface @@ -332,20 +334,27 @@ static int screen_process_form(struct config_screen *screen) } } + talloc_free(config->http_proxy); + talloc_free(config->https_proxy); + str = widget_textbox_get_value(screen->widgets.http_proxy_f); + config->http_proxy = talloc_strdup(config, str); + str = widget_textbox_get_value(screen->widgets.https_proxy_f); + config->https_proxy = talloc_strdup(config, str); + allow_write = widget_select_get_value(screen->widgets.allow_write_f); if (allow_write != config->allow_writes) config->allow_writes = allow_write; - if (config->n_tty) { - tty = widget_select_get_value(screen->widgets.boot_tty_f); - if (!config->boot_tty) { - config->boot_tty = talloc_strdup(config, - config->tty_list[tty]); - } else if (strncmp(config->boot_tty, config->tty_list[tty], - strlen(config->boot_tty)) != 0) { - talloc_free(config->boot_tty); - config->boot_tty = talloc_strdup(config, - config->tty_list[tty]); + if (config->n_consoles && !config->manual_console) { + idx = widget_select_get_value(screen->widgets.boot_console_f); + if (!config->boot_console) { + config->boot_console = talloc_strdup(config, + config->consoles[idx]); + } else if (strncmp(config->boot_console, config->consoles[idx], + strlen(config->boot_console)) != 0) { + talloc_free(config->boot_console); + config->boot_console = talloc_strdup(config, + config->consoles[idx]); } } @@ -384,6 +393,26 @@ static void cancel_click(void *arg) screen->exit = true; } +static void ipmi_clear_click(void *arg) +{ + struct config_screen *screen = arg; + struct config *config; + int rc; + + config = config_copy(screen, screen->cui->config); + config->ipmi_bootdev = IPMI_BOOTDEV_INVALID; + config->safe_mode = false; + + rc = cui_send_config(screen->cui, config); + talloc_free(config); + + if (rc) + pb_log("cui_send_config failed!\n"); + else + pb_debug("config sent!\n"); + screen->exit = true; +} + static int layout_pair(struct config_screen *screen, int y, struct nc_widget_label *label, struct nc_widget *field) @@ -411,6 +440,7 @@ static void config_screen_layout_widgets(struct config_screen *screen) widget_move(wl, y, screen->label_x); wf = widget_select_base(screen->widgets.autoboot_f); + widget_set_visible(wf, true); widget_move(wf, y, screen->field_x); y += widget_height(wf); @@ -472,7 +502,8 @@ static void config_screen_layout_widgets(struct config_screen *screen) widget_move(wf, y, screen->field_x); widget_move(wh, y, screen->field_x + widget_width(wf) + 1); y += 2; - } + } else + y += 1; if (screen->ipmi_override) { wl = widget_label_base(screen->widgets.ipmi_type_l); @@ -481,7 +512,7 @@ static void config_screen_layout_widgets(struct config_screen *screen) y += 1; wl = widget_label_base(screen->widgets.ipmi_clear_l); - wf = widget_checkbox_base(screen->widgets.ipmi_clear_cb); + wf = widget_button_base(screen->widgets.ipmi_clear_b); widget_set_visible(wl, true); widget_set_visible(wf, true); widget_move(wl, y, screen->label_x); @@ -580,14 +611,14 @@ static void config_screen_layout_widgets(struct config_screen *screen) y += 1; } - y += 1; + wf = widget_textbox_base(screen->widgets.http_proxy_f); + layout_pair(screen, y, screen->widgets.http_proxy_l, wf); + y++; + wf = widget_textbox_base(screen->widgets.https_proxy_f); + layout_pair(screen, y, screen->widgets.https_proxy_l, wf); + y++; - show = screen->cui->config->safe_mode; - if (show) { - widget_move(widget_label_base(screen->widgets.safe_mode), - y, screen->field_x); - y += 1; - } + y += 1; layout_pair(screen, y, screen->widgets.allow_write_l, widget_select_base(screen->widgets.allow_write_f)); @@ -595,20 +626,44 @@ static void config_screen_layout_widgets(struct config_screen *screen) y += 1; - if (widget_height(widget_select_base(screen->widgets.boot_tty_f))) { - layout_pair(screen, y, screen->widgets.boot_tty_l, - widget_select_base(screen->widgets.boot_tty_f)); - y += widget_height(widget_select_base(screen->widgets.boot_tty_f)); - widget_move(widget_label_base(screen->widgets.current_tty_l), + if (screen->widgets.manual_console_l) { + layout_pair(screen, y++, screen->widgets.boot_console_l, + widget_label_base(screen->widgets.manual_console_l)); + widget_move(widget_label_base(screen->widgets.current_console_l), + y, screen->field_x); + widget_set_visible(widget_select_base( + screen->widgets.boot_console_f), false); + y += 2; + } else if (widget_height(widget_select_base(screen->widgets.boot_console_f))) { + layout_pair(screen, y, screen->widgets.boot_console_l, + widget_select_base(screen->widgets.boot_console_f)); + y += widget_height(widget_select_base(screen->widgets.boot_console_f)); + widget_move(widget_label_base(screen->widgets.current_console_l), y, screen->field_x); y += 2; } else { widget_set_visible(widget_label_base( - screen->widgets.boot_tty_l), false); + screen->widgets.boot_console_l), false); widget_set_visible(widget_select_base( - screen->widgets.boot_tty_f), false); + screen->widgets.boot_console_f), false); widget_set_visible(widget_label_base( - screen->widgets.current_tty_l), false); + screen->widgets.current_console_l), false); + } + + if (screen->net_override) { + widget_move(widget_label_base(screen->widgets.net_override_l), + y, screen->label_x); + widget_set_visible(widget_label_base(screen->widgets.net_override_l), + true); + y += 1; + } + + if (screen->cui->config->safe_mode) { + widget_move(widget_label_base(screen->widgets.safe_mode), + y, screen->label_x); + widget_set_visible(widget_label_base(screen->widgets.safe_mode), + true); + y += 1; } widget_move(widget_button_base(screen->widgets.ok_b), @@ -772,7 +827,7 @@ static void config_screen_setup_widgets(struct config_screen *screen, { struct nc_widgetset *set = screen->widgetset; struct interface_config *ifcfg; - char *str, *ip, *mask, *gw, *url, *tty; + char *str, *ip, *mask, *gw, *url, *tty, *label; enum net_conf_type type; unsigned int i; int add_len, clear_len, any_len, min_len = 20; @@ -828,7 +883,6 @@ static void config_screen_setup_widgets(struct config_screen *screen, for (i = 0; i < sysinfo->n_blockdevs; i++) { struct blockdev_info *bd = sysinfo->blockdevs[i]; - char *label; label = talloc_asprintf(screen, _("disk: %s [uuid: %s]"), bd->name, bd->uuid); @@ -838,7 +892,7 @@ static void config_screen_setup_widgets(struct config_screen *screen, for (i = 0; i < sysinfo->n_interfaces; i++) { struct interface_info *info = sysinfo->interfaces[i]; - char *label, mac[20]; + char mac[20]; mac_str(info->hwaddr, info->hwaddr_size, mac, sizeof(mac)); @@ -849,7 +903,6 @@ static void config_screen_setup_widgets(struct config_screen *screen, } for (i = DEVICE_TYPE_NETWORK; i < DEVICE_TYPE_UNKNOWN; i++) { - char *label; if (i == DEVICE_TYPE_ANY) label = talloc_asprintf(screen, _("Any Device")); @@ -890,17 +943,19 @@ static void config_screen_setup_widgets(struct config_screen *screen, widget_textbox_set_validator_integer(screen->widgets.timeout_f, 0, 999); if (config->ipmi_bootdev) { - char *label = talloc_asprintf(screen, + label = talloc_asprintf(screen, _("%s IPMI boot option: %s"), config->ipmi_bootdev_persistent ? - "Persistent" : "Temporary", + _("Persistent") : _("Temporary"), ipmi_bootdev_display_name(config->ipmi_bootdev)); screen->widgets.ipmi_type_l = widget_new_label(set, 0, 0, label); screen->widgets.ipmi_clear_l = widget_new_label(set, 0, 0, _("Clear option:")); - screen->widgets.ipmi_clear_cb = widget_new_checkbox(set, 0, 0, - false); + screen->widgets.ipmi_clear_b = widget_new_button(set, 0, 0, + strncols(_("Clear IPMI override now")) + 10, + _("Clear IPMI override now"), + ipmi_clear_click, screen); screen->ipmi_override = true; } @@ -959,6 +1014,12 @@ static void config_screen_setup_widgets(struct config_screen *screen, url = ifcfg->static_config.url; } + screen->net_override = ifcfg && ifcfg->override; + if (screen->net_override) { + screen->widgets.net_override_l = widget_new_label(set, 0, 0, + _("Network Override Active! 'OK' will overwrite interface config")); + } + screen->widgets.ip_addr_l = widget_new_label(set, 0, 0, _("IP/mask:")); screen->widgets.ip_addr_f = widget_new_textbox(set, 0, 0, 16, ip); screen->widgets.ip_mask_l = widget_new_label(set, 0, 0, "/"); @@ -981,6 +1042,7 @@ static void config_screen_setup_widgets(struct config_screen *screen, screen->widgets.url_l = widget_new_label(set, 0, 0, _("URL:")); screen->widgets.url_f = widget_new_textbox(set, 0, 0, 32, url); + widget_textbox_set_validator_url(screen->widgets.url_f); screen->widgets.url_help_l = widget_new_label(set, 0, 0, _("(eg. tftp://)")); @@ -1002,6 +1064,15 @@ static void config_screen_setup_widgets(struct config_screen *screen, screen->widgets.dns_dhcp_help_l = widget_new_label(set, 0, 0, _("(if not provided by DHCP server)")); + screen->widgets.http_proxy_l = widget_new_label(set, 0, 0, + _("HTTP Proxy:")); + screen->widgets.http_proxy_f = widget_new_textbox(set, 0, 0, 32, + config->http_proxy); + screen->widgets.https_proxy_l = widget_new_label(set, 0, 0, + _("HTTPS Proxy:")); + screen->widgets.https_proxy_f = widget_new_textbox(set, 0, 0, 32, + config->https_proxy); + if (config->safe_mode) screen->widgets.safe_mode = widget_new_label(set, 0, 0, _("Selecting 'OK' will exit safe mode")); @@ -1019,22 +1090,28 @@ static void config_screen_setup_widgets(struct config_screen *screen, _("Allow bootloader scripts to modify disks"), config->allow_writes); - screen->widgets.boot_tty_l = widget_new_label(set, 0, 0, - _("Default tty:")); - screen->widgets.boot_tty_f = widget_new_select(set, 0, 0, + screen->widgets.boot_console_l = widget_new_label(set, 0, 0, + _("Boot console:")); + screen->widgets.boot_console_f = widget_new_select(set, 0, 0, COLS - screen->field_x - 1); - for (i = 0; i < config->n_tty; i++){ - found = config->boot_tty && - strncmp(config->boot_tty, config->tty_list[i], - strlen(config->boot_tty)) == 0; - widget_select_add_option(screen->widgets.boot_tty_f, i, - config->tty_list[i], found); + for (i = 0; i < config->n_consoles; i++){ + found = config->boot_console && + strncmp(config->boot_console, config->consoles[i], + strlen(config->boot_console)) == 0; + widget_select_add_option(screen->widgets.boot_console_f, i, + config->consoles[i], found); + } + + if (config->manual_console) { + label = talloc_asprintf(screen, _("Manually set: '%s'"), + config->boot_console); + screen->widgets.manual_console_l = widget_new_label(set, 0, 0, label); } tty = talloc_asprintf(screen, _("Current interface: %s"), ttyname(STDIN_FILENO)); - screen->widgets.current_tty_l = widget_new_label(set, 0 , 0, tty); + screen->widgets.current_console_l = widget_new_label(set, 0 , 0, tty); screen->widgets.ok_b = widget_new_button(set, 0, 0, 10, _("OK"), ok_click, screen);